Changeset 37523

Timestamp:

2023-03-16T20:04:52+13:00 (8 days ago)

Author:

kjdon

Message:

changes reflecting changes to favourites service names, and the xml that gets returned. also started work on mailing which is not finished.

Location:

main/trunk/greenstone3/web/interfaces/default/js/favouritebasket

Files:

• favouritebasket.js (modified) (6 diffs)
• favouritecheckout.js (modified) (7 diffs)

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

@@ -11 +11 @@
 var countFavourites = function(callback) {
         var request_type = "GET";
-    var url = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=ItemNum&o=XML&hhf="+makeURLComponentSafe("[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]")+"&c=";
+    var url = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=GetNumFavourites&o=XML&hhf="+makeURLComponentSafe("[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]")+"&c=";
 
     var responseSuccess = function(o) {
@@ -18 +18 @@
     var size = response.getElementsByTagName('size').item(0).getAttribute('value');
     
-    var items = response.getElementsByTagName('item');
+    var items = response.getElementsByTagName('documentNode');
 
     callback(items.length);
@@ -34 +34 @@
     
     var request_type = "GET";
-    var url = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=ItemNum&o=XML&hhf="+makeURLComponentSafe("[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]")+"&c=";
+    var url = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=GetNumFavourites&o=XML&hhf="+makeURLComponentSafe("[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]")+"&c=";
 
     var responseSuccess = function(o){
@@ -41 +41 @@
         var size = response.getElementsByTagName('size').item(0).getAttribute('value');
 
-        var items = response.getElementsByTagName('item');
+        var items = response.getElementsByTagName('documentNode');
 
         berryList = new Array();
@@ -113 +113 @@
 
 function addFavourite(el){
-    var addurl = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=AddItem&c=&s1.id=2&o=XML&hhf="+makeURLComponentSafe("[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]")+"&s1.item=" + el.id;
+    var addurl = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=AddFavourite&c=&s1.id=2&o=XML&hhf="+makeURLComponentSafe("[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]")+"&s1.item=" + el.id;
 
     var request_type = "GET";
     var addSuccess = function(o){
         var result = o.responseXML;
-        var items = result.getElementsByTagName('item');
+        var items = result.getElementsByTagName('documentNode');
 
         if (items.length > 0){
@@ -143 +143 @@
 
 function deleteFavourite(el){
-    var delurl = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=DeleteItems&c=&o=XML&hhf="+makeURLComponentSafe("[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]")+"&s1.items=" + el.id;
+    var delurl = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=DeleteFavourites&c=&o=XML&hhf="+makeURLComponentSafe("[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]")+"&s1.items=" + el.id;
 
     var request_type = "GET";

main/trunk/greenstone3/web/interfaces/default/js/favouritebasket/favouritecheckout.js

@@ -5 +5 @@
 var document_link_collections = new Array(); // or add list of collections as above.
 //these are the default metadata items used by favourite baskets.
-var default_metas = ["Title", "root_Title", "root_assocfilepath", "root_srclinkFile", "name", "collection", "Date"];
+var default_metas = ["Title", "root_Title", "root_assocfilepath", "root_srclinkFile", "nodeID", "collection", "Date"];
 
 var docList = new Array();
@@ -18 +18 @@
 
 var options = ['fullview', 'textview', 'email'];
-var delurlPath = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=DeleteItems&c=&o=XML&hhf="+makeURLComponentSafe("[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]")+"&s1.items=";
+var delurlPath = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=DeleteFavourites&c=&o=XML&hhf="+makeURLComponentSafe("[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]")+"&s1.items=";
 var request_type = "GET"; // the default
 
@@ -247 +247 @@
 function showFullViewFavourites(){
 
-    var content =  YAHOO.util.Dom.get('berryBasketContent');
+    var content =  YAHOO.util.Dom.get('berryBasketContentXX');
     var fullview =  YAHOO.util.Dom.get('fullview');
-    berryCheckoutPageClear();
+    //berryCheckoutPageClear();
 
         var berryBasketDelOptions = YAHOO.util.Dom.get('delOptions');
@@ -264 +264 @@
     }
 
+    var share_anchor = YAHOO.util.Dom.get('shareBasket');
+    var plain_text = "";
     var dlist = document.createElement('div');
     content.appendChild(dlist);
@@ -288 +290 @@
         li.appendChild(img);
 
-        generateDocDisplay(li, doc, doc_id)
+        generateDocDisplay(li, doc, doc_id);
+            plain_text += generateMailEntry(doc, doc_id)+"%0D%0A%0D%0A";
         li.className = 'berrydoc';
         ul.appendChild(li);
     }
 
-}
-
+    var mailto = "mailto:?Subject=Favourites&body="+plain_text;
+    share_anchor.setAttribute("href", mailto);
+}
+
+function generateMailEntry(doc) {
+
+    var url=generateURL(doc);
+    var title = doc['Title'];
+    return "Title: "+title+"%0D%0AURL:"+url;
+
+}
 function generateDocDisplay(li, doc, doc_id) {
     var a = document.createElement('a');
@@ -525 +537 @@
     var link_type = getDefaultLinkType(doc["collection"]);
     if (link_type == "document") {
-    url = root_url+"/collection/"+doc["collection"]+"/document/"+doc["name"];
+    url = root_url+"/collection/"+doc["collection"]+"/document/"+doc["nodeID"];
     } else if (link_type == "source") { 
     url = root_url+"/sites/"+gs.xsltParams.site_name+"/collect/"+doc['collection']+"/index/assoc/"+doc["root_assocfilepath"]+"/"+doc["root_srclinkFile"];
@@ -583 +595 @@
 
 function sendMail(){
-    var url = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=SendMail&c=";
+    var url = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=SendFavouritesMail&c=";
     var request_type = "POST";
     var postdata = "";