Mercurial > hg > LGToc
changeset 7:3abf39f0eb46
bug fixed: sessionId from LGServices
author | Zoe Hong <zhong@mpiwg-berlin.mpg.de> |
---|---|
date | Wed, 27 May 2015 14:32:34 +0200 |
parents | 4d59439c8b46 |
children | 7258ccd8ef7d |
files | check_sections_details.php config/config.php edit_section_db.php js/check_sections_details.js |
diffstat | 4 files changed, 61 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/check_sections_details.php Tue Apr 21 15:00:19 2015 +0200 +++ b/check_sections_details.php Wed May 27 14:32:34 2015 +0200 @@ -97,7 +97,10 @@ if (isset($_GET['sessionId'])) { // check if get session info from LGService, to get username as editor $session_id = $_GET['sessionId']; - $lg_url = "http://localgazetteers-dev/LGServices/rest/utils/getUser?sessionId=".$session_id; // url to get username from LGService + + global $lgserver_url; + $lg_url = $lgserver_url."rest/utils/getUser?sessionId=".$session_id; // url to get username from LGService + //$lg_url = "http://localgazetteers-dev/LGServices/rest/utils/getUser?sessionId=".$session_id; // url to get username from LGService $output = file_get_contents($lg_url); $user_info = json_decode($output, true); $current_editor = (string)$user_info['userName'];
--- a/config/config.php Tue Apr 21 15:00:19 2015 +0200 +++ b/config/config.php Wed May 27 14:32:34 2015 +0200 @@ -8,17 +8,18 @@ $mysql_server = "localhost"; $mysql_user = "root"; $mysql_password = "admin"; - $server_host = "http://localgazetteers-dev/"; - $lgserver_url = $server_host."LGServer/"; + $server_host = "http://localgazetteers/"; + $lgserver_url = $server_host."LGServices/"; } else { // localhost - $mysql_database = "Gazetteers"; + $mysql_database = "Gazetteer"; $mysql_server = "localhost"; $mysql_user = "root"; $mysql_password = "root"; $server_host = "http://localhost:1080/localgazetteers-dev/"; - $lgserver_url = "http://localgazetteers-dev/LGServer/"; + //$lgserver_url = "http://localgazetteers-dev/LGServer/"; + $lgserver_url = "http://localhost:8080/LGServices/"; } $systemNAME = "interface";
--- a/edit_section_db.php Tue Apr 21 15:00:19 2015 +0200 +++ b/edit_section_db.php Wed May 27 14:32:34 2015 +0200 @@ -137,8 +137,6 @@ } $versionId=mysql_insert_id(); - - $query="INSERT INTO sections_revisions (name,books_id,section_after,start_page,end_page,level,split_from,sections_id,versions_id,deleted) VALUES "; foreach($sectionArray as $idx=>$row){ // get the section_id @@ -167,7 +165,10 @@ } $rst = mysql_query($qry); + if (!$rst) { + error_log("error in querying sections_index table.",0); + break; // handle to ROLLBACK } @@ -182,6 +183,8 @@ $qry = "DELETE FROM sections_index WHERE id=".$section_id; $rst = mysql_query($qry); if (!$rst) { + error_log("error in deleting sections_index table.",0); + break; // handle to ROLLBACK } @@ -189,6 +192,7 @@ $qry = "SELECT * FROM sections_index WHERE id=".$section_id; $rst = mysql_query($qry); if (!$rst) { + error_log("error in selecting sections_index table.",0); break; // handle to ROLLBACK } if (mysql_num_rows($rst) == 0) { @@ -198,6 +202,7 @@ // recover section in sections_index table where id = $section_id $rst = mysql_query($qry); if (!$rst) { + error_log("error in inserting to sections_index table.".mysql_error(),0); break; // handle to ROLLBACK } } @@ -205,7 +210,7 @@ } // query for sections_revisions table - + $str="("; $str.="'".$name."',"; $str.="'".$books_id."',"; @@ -218,23 +223,30 @@ $str.=$versionId.","; $str.=$deleted; $str.=")"; + if($idx!=sizeof($sectionArray)-1){ $str.=", "; } - + $query.=$str; + } + $result=mysql_query($query); - + if (!$result) { + error_log("error in inserting all records to sections_index table.".mysql_error(),0); + } + // --- End Transaction --- if ($result and $rst) { mysql_query("COMMIT"); echo json_encode("Succeeded."); // important returning info to js } else { - mysql_query("ROLLBACK"); - echo json_encode("Failed during updating sections."); + mysql_query("ROLLBACK"); + $err_msg = "Failed during updating sections."; + echo json_encode($err_msg); return; }
--- a/js/check_sections_details.js Tue Apr 21 15:00:19 2015 +0200 +++ b/js/check_sections_details.js Wed May 27 14:32:34 2015 +0200 @@ -145,7 +145,10 @@ }); } -function initLevel(){//init the column level, turn it into select element + + +// TODO: rewrite initLevel(), change select to ">>" or "<<" button +function initLevel(){ //level var levelObj=$("<div/>").addClass("editLevel").append("<select/>"); $(".entry").append(levelObj); @@ -172,6 +175,35 @@ entryObj.addClass("level"+$(this).val()); }); } +/* +function initLevel_old(){//init the column level, turn it into select element + //level + var levelObj=$("<div/>").addClass("editLevel").append("<select/>"); + $(".entry").append(levelObj); + $(".editLevel select").append("<option value='1'>level 1</option>"); + $(".editLevel select").append("<option value='2'>level 2</option>"); + $(".editLevel select").append("<option value='3'>level 3</option>"); + for(var i=1; i<=3; i++){ + $("div.level"+i+" .editLevel select").val(i); + } + + $(".editLevel select").change(function(){//add classes for text indent, to control layout style + var entryObj=$(this).parent().parent(); + var className=""; + if(entryObj.hasClass("level1")){ + className="level1"; + } + if(entryObj.hasClass("level2")){ + className="level2"; + } + if(entryObj.hasClass("level3")){ + className="level3"; + } + entryObj.removeClass(className); + entryObj.addClass("level"+$(this).val()); + }); +} +*/ function initDelete(){ //delete var deleteObj=$("<div/>").addClass("deleteEntry").append("<input type='button' value='delete' class='deleteButton'>");