Mercurial > hg > extraction-interface

changeset 68:6676ca451dcc extractapp

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New: check taglist is deprecated or not. Change url 'LGserver'->'LGServices'
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Tue, 07 Apr 2015 14:59:39 +0200
parents 3ada9334ebfc
children edb8a2e8ce84
files config/config.php views/Extractapp/TaggingText.php
diffstat 2 files changed, 2 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/config/config.php	Tue Apr 07 14:45:31 2015 +0200
+++ b/config/config.php	Tue Apr 07 14:59:39 2015 +0200
@@ -9,7 +9,7 @@
 	$mysql_user = "root";
 	$mysql_password = "admin";
 	$server_host = "http://localgazetteers-dev/";
-	$lgserver_url = $server_host."LGServer/";
+	$lgserver_url = $server_host."LGServices/";
 
 } else {
 	// localhost
@@ -18,7 +18,7 @@
 	$mysql_user = "root";
 	$mysql_password = "root";
 	$server_host = "http://localhost:1080/localgazetteers-dev/";
-	$lgserver_url = "http://localgazetteers-dev/LGServer/";
+	$lgserver_url = "http://localgazetteers-dev/LGServices/";
 }
 
 $systemNAME = "interface";
--- a/views/Extractapp/TaggingText.php	Tue Apr 07 14:45:31 2015 +0200
+++ b/views/Extractapp/TaggingText.php	Tue Apr 07 14:59:39 2015 +0200
@@ -209,30 +209,6 @@
 
     }
 
-    // --- handle old version taglist ---
-        // --- TODO: check if taglist in file is up-to-date ---
-        /*
-        var taglist_infile = JSON.parse('<?php echo json_encode($taglist_infile) ?>');
-        if (taglist_infile != "") {
-            // TODO: pop up to ask if load the latest taglist
-            var retVal = confirm("Tag list in file is not up-to-date. \nDo you want to load file with new tag list?");
-            if( retVal == true ){
-                // use $taglisArray
-                alert("Load file with new tag list.");
-            }else{
-                // use $taglist_infile as $taglistArray
-                <?php 
-                // $taglistArray = $taglist_infile; 
-                ?>
-                alert("You are viewing the file with old version of tag list. Please use the up-to-date taglist.");
-            }
-            //_showTagColor(retVal);
-            <?php $taglist_infile = ""; ?>
-        }
-        */
-    
-   
-
 });
 
 $(document).on("mouseup", '#editable-area', function (e) {