Changeset 31014

Timestamp:

2016-11-01T07:42:03+13:00 (7 years ago)

Author:

Georgiy Litvinov

Message:

Modified hierarchy js storage, added kjdon fixes.

File:

• main/trunk/greenstone3/web/interfaces/default/js/hierarchy.js (modified) (5 diffs)

main/trunk/greenstone3/web/interfaces/default/js/hierarchy.js

@@ -12 +12 @@
 {
     
-    var id = a.parentElement.id;
-    //console.log("Try to set ID" + id)
+    var id = a.getAttribute("title");
+    
 // If ID defined and not null
     if (id && (id != null)) 
@@ -72 +72 @@
                 {
                     if(childExpr.test(key)){
-                        levelItems[key]='<li id="'+key+'" ><button onclick="setHierarchyId(this)"  title='+ hierarchyData[key] +'>' + hierarchyData[key] + '</button></li>';
+                        levelItems[key]='<li id="'+key+'" ><button onclick="setHierarchyId(this)"  title='+ hierarchyData[key][0] +'>' + hierarchyData[key][1] + '</button></li>';
                         //console.log(levelItems[key]);
                         
@@ -137 +137 @@
               var StringData = [];
                 var hierarchyData = {};
-                var expr = /^([0-9]+(?:\.[0-9]+)*)\ ([0-9]+(?:\.[0-9]+)*)\ (.*)/m;
+                //var expr = /^([0-9]+(?:\.[0-9]+)*)\ ([0-9]+(?:\.[0-9]+)*)\ (.*)/m;
+                var expr = /^(\S*|\"[^\"]*\")\ +([0-9]+(?:\.[0-9]+)*)\ +(.*)/m;
                 StringData = hierarchyFile.split('\n');
                 for (var i = 0; i < StringData.length; i++) 
@@ -143 +144 @@
                     var result = StringData[i].match(expr);
                     // If result not null
-                    if (result != null && result[2] != null && result[3] != null) 
+                    if (result != null && result.length == 4) 
                         {
                         // populate hierarchy object
-                        hierarchyData[result[2]] = result[3];
+                        hierarchyData[result[2]] = [result[1], result[3]];
                         }
 
@@ -242 +243 @@
         if (SuggestionsMenuExp.test(key)) 
         {
-            SuggestionsMenuItems[key]='<li class="hierarchySuggestionsMenu" id="'+key+'" ><button onclick="setHierarchyId(this)" >' + key.substring(String(input).length) + " "  + hierarchyData[key] + '</button></li>';
+            SuggestionsMenuItems[key]='<li class="hierarchySuggestionsMenu" id="'+key+'" ><button title='+ hierarchyData[key][0] +' onclick="setHierarchyId(this)" >' + key.substring(String(input).length) + " " + hierarchyData[key][1] + '</button></li>';
         }