Changeset 27018 for main/trunk/greenstone2/macros

Timestamp:

2013-03-07T14:13:30+13:00 (11 years ago)

Author:

ak19

Message:

1. style.dm had a typo when referring back to the new macro, 2. depositdspace.dm javascript function now url-decodes all the chars encoded in cgiutil.cpp when getting them out of hte db. Thanks to Kathy.

Location:

main/trunk/greenstone2/macros

Files:

• depositdspace.dm (modified) (10 diffs)
• style.dm (modified) (2 diffs)

main/trunk/greenstone2/macros/depositdspace.dm

@@ -275 +275 @@
 
 
-  function comma\_decode(str)
+  function comma\_and\_special_chars\_decode(str)
   \{
-      var newstr = str.replace(/\\%27/g,"'");
+      var newstr = newstr = str.replace(/\\%2F/g,"/");
+      newstr = newstr.replace(/\\%27/g,"'");
+      newstr = newstr.replace(/\\%22/g,"\\\"");
+      newstr = newstr.replace(/\\%26/g,"&");
+      newstr = newstr.replace(/\\%3E/g,">");
+      newstr = newstr.replace(/\\%3C/g,"<");
 
       // the comma was already being decoded for dspace's deposit dm file
@@ -293 +298 @@
       if (prevarray.value) \{
 
-        var prevvalarray = comma\_decode(prevarray.value);
+        var prevvalarray = comma\_and\_special_chars\_decode(prevarray.value);
 
         var fieldnum = get\_fieldid(fieldid,"num");
@@ -1363 +1368 @@
   var authornum = "_di1authornum_";
   var authorsplit = "_di1authorsplit_";
-  var authorarray = comma\_decode("_di1authorarray_");
+  var authorarray = comma\_and\_special_chars\_decode("_di1authorarray_");
 
   present\_general(authorarray,authornum,authorsplit,combine\_author);
@@ -1384 +1389 @@
   var seriesrepnum = "_di1seriesrepnum_";
   var seriesrepsplit = "_di1seriesrepsplit_";
-  var seriesreparray = comma\_decode("_di1seriesreparray_");
+  var seriesreparray = comma\_and\_special_chars\_decode("_di1seriesreparray_");
 
   present\_general(seriesreparray,seriesrepnum,seriesrepsplit,combine\_seriesrep);
@@ -1398 +1403 @@
   var idnum = "_di1identifiernum_";
   var idsplit = "_di1identifiersplit_";
-  var idarray = comma\_decode("_di1identifierarray_");
+  var idarray = comma\_and\_special_chars\_decode("_di1identifierarray_");
 
   present\_general(idarray,idnum,idsplit,combine\_id);
@@ -1445 +1450 @@
   var subnum = "_di1subjectnum_";
   var subsplit = "_di1subjectsplit_";
-  var subarray = comma\_decode("_di1subjectarray_");
+  var subarray = comma\_and\_special_chars\_decode("_di1subjectarray_");
 
   present\_general(subarray,subnum,subsplit,combine\_flat);
@@ -1559 +1564 @@
   var authornum = "_di1authornum_";
   var authorsplit = "_di1authorsplit_";
-  var authorarray = comma\_decode("_di1authorarray_");
+  var authorarray = comma\_and\_special_chars\_decode("_di1authorarray_");
   var combauthor = combine\_escauthor(authorarray,authornum,authorsplit);
   hidden\_multifield("ds.Author",combauthor);
@@ -1565 +1570 @@
   var seriesrepnum = "_di1seriesrepnum_";
   var seriesrepsplit = "_di1seriesrepsplit_";
-  var seriesreparray = comma\_decode("_di1seriesreparray_");
+  var seriesreparray = comma\_and\_special_chars\_decode("_di1seriesreparray_");
   var combseriesrep = combine\_seriesrep(seriesreparray,seriesrepnum,seriesrepsplit);
   hidden\_multifield("ds.Series",combseriesrep);
@@ -1571 +1576 @@
   var idnum = "_di1identifiernum_";
   var idsplit = "_di1identifiersplit_";
-  var idarray = comma\_decode("_di1identifierarray_");
+  var idarray = comma\_and\_special_chars\_decode("_di1identifierarray_");
   var combid = combine\_id(idarray,idnum,idsplit);
   hidden\_multifield("ds.Identifier",combid);
@@ -1578 +1583 @@
   var subnum = "_di1subjectnum_";
   var subsplit = "_di1subjectsplit_";
-  var subarray = comma\_decode("_di1subjectarray_");
+  var subarray = comma\_and\_special_chars\_decode("_di1subjectarray_");
   var combsub = combine\_flat(subarray,subnum,subsplit);
   hidden\_multifield("ds.Subject",combsub);

main/trunk/greenstone2/macros/style.dm

@@ -73 +73 @@
   <link rel="stylesheet" href="_httpstyle_/style-print.css" type="text/css" 
    title="Printer" charset="UTF-8" media="print" _linktagend_ 
-  _cssfilelinkextra_
+  _cssfilelinkextra_ 
 }
 
@@ -96 +96 @@
 
 # separate macro so additional stylesheets (to those included by default) can be specified
-_cssfilelinkeextra_ {}
+_cssfilelinkextra_ {}
 
 # Languages that should be displayed right-to-left