Changeset 23812 for main/trunk/greenstone2

Timestamp:

2011-03-24T16:55:01+13:00 (13 years ago)

Author:

davidb

Message:

Improvements to the handling of the URL passed in as _2_

File:

• main/trunk/greenstone2/macros/document.dm (modified) (2 diffs)

main/trunk/greenstone2/macros/document.dm

@@ -519 +519 @@
 
 
+
+
 package Global
-
+    
 # Social network support
 # Defined here in document, as the most likely place this will be used in
@@ -529 +531 @@
 # _2_ = [srclink] or left empty.  If left empty, then it will share the internal GS document
 
-
 _sharemescript_ {
   <script type="text/javascript">
-
     var a2a_config = a2a_config || \{ \};
     a2a_config.linkname = "_1_";
-_If_(_2_,
+
+    _If_(_2_,
     var srclink = \'_2_\';
-    var href = srclink.match(/href=\"([^\"]*)\"/);
-    a2a_config.linkurl = gsapi.fullDomainURL(href[1]);
-,
+    
+    //If metadata value is a valid URL that starts with xxx:// 
+    // (e.g. any protocol\, http, https\, ftp ...) then that will be the link to share
+    if (srclink.match(/^[^:]+:\\\/\\\//i)) \{
+          a2a_config.linkurl = srclink;
+     \}
+    else \{
+    //if metadata value is [srclink] then we have to cut off the 'href' tag label
+        var href = srclink.match(/href=\"([^\"]*)\"/);
+        a2a_config.linkurl = gsapi.fullDomainURL(href[1]);
+    \}
+    ,
+    //if no metadata was passed as link\, then the GS version of the document will be used.
     a2a_config.linkurl = gsapi.fullDomainURL("_gwcgi_")+ "?c=_cgiargc_&a=d&d=_cgiargd_";
 )