Changeset 33182 for main/trunk/greenstone3

Timestamp:

2019-06-21T14:33:58+12:00 (5 years ago)

Author:

kjdon

Message:

source links now do have library/sites/localsite etc, so we don't need to remove the library part

File:

• main/trunk/greenstone3/web/interfaces/default/js/berrybasket/berrycheckout.js (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/js/berrybasket/berrycheckout.js

@@ -1 +1 @@
 // The default link type in the basket - "document" = greenstone version of the document, "source" = link to source file eg pdf.
-var default_link_type = "document"; // "source" or "document"
+//var default_link_type = "document"; // "source" or "document"
+var default_link_type = "source";
 // use the appropriate one of these to override the default for particular collections.
 var source_link_collections = new Array(); // or add list of collections like ["pdfberry", "mgppdemo"];
@@ -557 +558 @@
     url = root_url+"/collection/"+doc["collection"]+"/document/"+doc["name"];
     } else if (link_type == "source") { 
-    // remove library
-    root_url = root_url.substring(0, root_url.lastIndexOf('/'));
     url = root_url+"/sites/"+gs.xsltParams.site_name+"/collect/"+doc['collection']+"/index/assoc/"+doc["root_assocfilepath"]+"/"+doc["root_srclinkFile"];
     }