Ticket #1262: zs15_fbennett_2008-12-18-2.patch

content/zotero/xpcom/csl.js

@@ -20 +20 @@
     ***** END LICENSE BLOCK *****
 */
 
+ /*
+ * PATCHES: fbennett
+ *
+ * This version of cls.js reflects the following modification:
+ *
+ * (2) Make the is-numeric test available with note/extra and locator
+ *     fields:
+ *       The Extra field can be used to overcome limitations in a
+ *     style, for use cases the are not covered by the current schema
+ *     (such as the handling of an original and a modern publication 
+ *     date for a resource).  The locator field is likely to come
+ *     under pressure for special pinpoint forms of a citation in
+ *     footnote styles.
+ *
+ *     The changes labeled fbennett (2) below improve the utility of
+ *     these fields by extending the is-numeric expression to cover 
+ *     them.
+ */
+
+
 /*
  * CSL: a class for creating bibliographies from CSL files
  * this is abstracted as a separate class for the benefit of anyone who doesn't
@@ -803 +823 @@
                                 for(var j=0; j<variables.length; j++) {
                                         if(ignore[0][variables[j]]) continue;
                                         
-                                        var text = item.getNumericVariable(variables[j], form);
+/* 
+ * fbennett (2): pass citationItem through to provide locator field data to function
+ */
+                                        var text = item.getNumericVariable(variables[j], citationItem, form);
+/* 
+ * fbennett: end
+ */
                                         if(text) {
                                                 newString.append(text);
                                                 success = true;
@@ -1061 +1087 @@
                                                                                 if (exists) exists = !!exists.length;
                                                                         }
                                                                 } else if (attribute == "is-numeric") {
-                                                                        exists = item.getNumericVariable(variables[j]);
+/*
+ * fbennett (2): pass through citationItem to provide locator field data to function
+ */
+                                                                                exists = item.getNumericVariable(variables[j], citationItem);
+/*
+ * fbennett: end
+ */
                                                                 } else if (attribute == "is-date") { // XXX - this needs improving
                                                                         if (Zotero.CSL._dateVariables[variables[j]]) {
                                                                                 exists = !!item.getDate(variables[j]);
@@ -1882 +1914 @@
         "issue":"issue",
         "number-of-volumes":"numberOfVolumes",
         "edition":"edition",
-        "number":"number"
+/*
+ * fbennett (2): adding note and locator fields to number field map
+ */
+        "number":"number",
+        "note":"extra",
+        "locator":"locator"
+/*
+ * fbennett: end
+ */
 }
 /*
  * Gets a numeric object for a specific type. <number variable="edition" form="roman"/>
  */
-Zotero.CSL.Item.prototype.getNumericVariable = function(variable, form) {
-
+/*
+ * fbennett (2): adding citationItem argument to function to gain access to locator field data
+ */ 
+Zotero.CSL.Item.prototype.getNumericVariable = function(variable, citationItem, form) {
+/*
+ * fbennett: end
+ */
         if(!Zotero.CSL.Item._zoteroNumberFieldMap[variable]) return "";
         
         var zoteroFields = [];
@@ -1903 +1948 @@
         
         var matches;
         for each(var zoteroField in zoteroFields) {
-                var value = this.zoteroItem.getField(zoteroField, false, true);
+/*
+ * fbennett (2): adding special handling for locator field
+ */
+                if(zoteroField == "locator") {
+                        var value = citationItem.locator;
+                } else {
+                        var value = this.zoteroItem.getField(zoteroField, false, true);
+                }
+/*
+ * fbennett: end
+ */
                 var matches;
                 if(value != "" && (matches = value.toString().match(Zotero.CSL._numberRegexp)) ) {
                         value = matches[0];