Changeset 27313 for main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

Timestamp:

2013-05-07T19:32:42+12:00 (11 years ago)

Author:

ak19

Message:

Now the existing user comments to be displayed are all retrieved in one go using the new get_metadata_array subroutine in metadataaction.pm via the new gsajaxapi method getMetadataArray which take a JSON string and return one. This loads user comments much faster, and doesn't get that much slower if the number of comments stored in the index database gets larger. 2 bugfixes to metadataaction.pm's recently added get_metadata_array subroutine: if no metapos supplied it defaults to 0 like the other get_meta functions instead of defaulting to the keyword 'all'. The fieldnames in the JSON string returned also needed to be inside double quotes in order to be successfully parsed back into a JSON object on the Javascript side. Replaced the old loadUserComments() javascript function in style.dm, which now calls the new gsajaxapi.getMetadataArray() post method.

File:

• main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm (modified) (5 diffs)

main/trunk/greenstone2/perllib/cgiactions/metadataaction.pm

@@ -270 +270 @@
 
 # takes a JSON string and returns a JSON string
+# resulting string is of the form:
+# [{"docid":"HASHc5bce2d6d3e5b04e470ec9","metatable":[{"metaname":"username","metavals":[{"metapos":"0","metavalue":"me"},{"metapos":"1","metavalue":"admin"}]},{"metaname":"usertimestamp","metavals":[{"metapos":"0","metavalue":"1367900586888"},{"metapos":"1","metavalue":"1367900616574"}]},{"metaname":"usercomment","metavals":[{"metapos":"0","metavalue":"Hi"},{"metapos":"1","metavalue":"Hello"}]}]}]
 sub _get_index_metadata_array
 {
@@ -304 +306 @@
         $json_result_str .= ",";
     }
-    $json_result_str = $json_result_str . "{docid:\"" . $docid . "\"";  
+    $json_result_str = $json_result_str . "{\"docid\":\"" . $docid . "\"";  
 
     my $metatable = $doc_array_rec->{'metatable'}; # a subarray, or need to generate an error saying JSON structure is wrong
-    $json_result_str = $json_result_str . ",metatable:[";
+    $json_result_str = $json_result_str . ",\"metatable\":[";
 
     my $first_rec = 1;
@@ -318 +320 @@
         
         my $metaname  = $metatable_rec->{'metaname'};
-        $json_result_str .= "{metaname:\"$metaname\",metavals:[";
+        $json_result_str .= "{\"metaname\":\"$metaname\",\"metavals\":[";
 
         my $metapos   = $metatable_rec->{'metapos'}; # 0... 1|all|undefined
         if(!defined $metapos) {
-        $metapos = "all";
+        $metapos = 0;
         }
 
@@ -344 +346 @@
 
         $metavalue = $doc_rec->{$metaname}->[$metapos];     
-        $json_result_str .= "{metapos:\"$metapos\",metavalue:\"$metavalue\"}";
+        $json_result_str .= "{\"metapos\":\"$metapos\",\"metavalue\":\"$metavalue\"}";
 
         } else {
@@ -358 +360 @@
             }
         
-            $json_result_str .= "{metapos:\"$metapos\",metavalue:\"$metavalue\"}";
+            $json_result_str .= "{\"metapos\":\"$metapos\",\"metavalue\":\"$metavalue\"}";
 
             $metapos++;