Changeset 25795

Timestamp:

2012-06-18T16:32:27+12:00 (11 years ago)

Author:

davidb

Message:

Updated to work with Greenstone3's Restful URLs

File:

• gs3-extensions/html-to-expeditee/trunk/src/src/cgi-bin/html-to-expeditee.pl.in (modified) (4 diffs)

gs3-extensions/html-to-expeditee/trunk/src/src/cgi-bin/html-to-expeditee.pl.in

@@ -98 +98 @@
           }
           else {
-              url = "dev";
+              url = "library";
               url += "?c="+collect +"&a=b&rt=s&s=ClassifierBrowse&cl=" + cl;
               url += "&excerptid=gs_content";
@@ -125 +125 @@
           /* any links with a=(b|d) ... cl=??? => outstandingURLS */
           /* any links with a=d ... d=???  => docOIDS */
-          
+
+/*        
           var actionRE = new RegExp("(\\\\?|&)a=(?:d|b)(&|\$)");
           var clRE     = new RegExp("(\\\\?|&)cl=" + cl + "(\\\\.\\\\d+)+(&|\$)");
           var docRE    = new RegExp("(?:\\\\?|&)d=(.*?)(?:&|\$)");
-
+*/
+          var actionRE = new RegExp("(\\\\/)(?:document|browse)(\\\\/)");
+          var clRE     = new RegExp("(\\\\/)browse\\\\/" + cl + "(\\\\/\\\\d+)+(\$)");
+          var docRE    = new RegExp("(?:\\\\/)document\\\\/(.*?)(?:\$)");
+          
           for (var i=0; i<aElems.length; i++) {
               var aElem = aElems[i];
@@ -167 +172 @@
           }
           else {
-              url = "dev";
+              url = "library";
               url += "?c="+collect +"&a=d&d=" + docOID;
               url += "&ed=1&dt=hierarchy";
@@ -258 +263 @@
               }
               else {
-                  url = "dev";
+                  url = "library";
                   url += "?c="+collect +"&a=d&d=" + docOID;
                   url += "&ed=1&dt=hierarchy";