www

commit 7fbd6c48a744e02a71c63ca17f96d5c57a65d018
parent 0cd3021cf3f1cad63ca4479f794380410c599e16
Author: Simon Kornblith <simon@simonster.com>
Date:   Wed, 30 Aug 2006 23:21:49 +0000

move Scholar.strToDate to Scholar.Date.strToDate (thanks Dan)


Diffstat:
M
chrome/chromeFiles/content/scholar/xpcom/cite.js
 | 
2
+-
M
chrome/chromeFiles/content/scholar/xpcom/scholar.js
 | 
171
+++++++++++++++++++++++++++++++++++++++----------------------------------------

2 files changed, 86 insertions(+), 87 deletions(-)
diff --git a/chrome/chromeFiles/content/scholar/xpcom/cite.js b/chrome/chromeFiles/content/scholar/xpcom/cite.js
@@ -1536,7 +1536,7 @@ CSL.prototype._separateItemCreators = function(item) {
  * return an object containing year, month, and day
  */
 CSL.prototype._processDate = function(string) {
-	return Scholar.strToDate(string);
+	return Scholar.Date.strToDate(string);
 }
 /*
  * END SCHOLAR-SPECIFIC CODE
diff --git a/chrome/chromeFiles/content/scholar/xpcom/scholar.js b/chrome/chromeFiles/content/scholar/xpcom/scholar.js
@@ -35,7 +35,6 @@ var Scholar = new function(){
 	this.randomString = randomString;
 	this.getRandomID = getRandomID;
 	this.moveToUnique = moveToUnique;
-	this.strToDate = strToDate;
 	
 	// Public properties
 	this.version;
@@ -426,91 +425,6 @@ var Scholar = new function(){
 		file.moveTo(newFile.parent, newName);
 		return file;
 	}
-	
-	/*
-	 * converts a string to an object containing:
-	 *    day: integer form of the day
-	 *    month: integer form of the month (indexed from 0, not 1)
-	 *    year: 4 digit year (or, year + BC/AD/etc.)
-	 *    part: anything that does not fall under any of the above categories
-	 *          (e.g., "Summer," etc.)
-	 */
-	function strToDate(string) {
-		var date = new Object();
-		
-		// skip empty things
-		if(!string) {
-			return date;
-		}
-		
-		// get short month strings from CSL interpreter
-		var months = CSL.getMonthStrings("short");
-		
-		string = string.replace(/^\s+/, "").replace(/\s+$/, "").replace(/\s+/, " ");
-		
-		var dateRe = /^([0-9]{4})[\-\/]([0-9]{2})[\-\/]([0-9]{2})$/;
-		var m = dateRe.exec(string);
-		if(m) {		// sql date
-			Scholar.debug("DATE: used form 1: SQL");
-			var jsDate = new Date(m[1], m[2]-1, m[3], false, false, false);
-		} else {	// not an sql date
-			var yearRe = /^((?:circa |around |about |c\.? ?)[0-9]{1,4}(?: ?B\.? ?C\.?(?: ?E\.?)?| ?C\.? ?E\.?| ?A\.? ?D\.?)|[0-9]{4})$/i;
-			if(yearRe.test(string)) {
-				// is just a year
-				Scholar.debug("DATE: used form 2: year-only");
-				date.year = string;
-				return date;
-			}
-			
-			// who knows what this is, but try JavaScript's date handling first
-			var jsDate = new Date(string)
-		}
-		
-		if(!isNaN(jsDate.valueOf())) {
-			Scholar.debug("DATE: retrieved from JavaScript");
-			// got a javascript date
-			date.year = jsDate.getFullYear();
-			date.month = jsDate.getMonth();
-			date.day = jsDate.getDate();
-			return date;
-		}
-		
-		// no javascript date. time for cruder things.
-		
-		// first, see if we have anything resembling a year
-		var yearRe = /^(.*)\b((?:circa |around |about |c\.? ?)[0-9]{1,4}(?: ?B\.? ?C\.?(?: ?E\.?)?| ?C\.? ?E\.?| ?A\.? ?D\.?)|[0-9]{4})\b(.*)$/i;
-		
-		var m = yearRe.exec(string);
-		if(m) {
-			date.year = m[2];
-			date.part = m[1]+m[3];
-			Scholar.debug("DATE: got year ("+date.year+", "+date.part+")");
-			
-			// then, see if have anything resembling a month anywhere
-			var monthRe = new RegExp("^(.*)\\b("+months.join("|")+")[^ ]* (.*)$", "i");
-			var m = monthRe.exec(date.part);
-			if(m) {
-				date.month = months.indexOf(m[2][0].toUpperCase()+m[2].substr(1).toLowerCase());
-				date.part = m[1]+m[3];
-				Scholar.debug("DATE: got month ("+date.month+", "+date.part+")");
-				
-				// then, see if there's a day 
-				var dayRe = /^(.*)\b([0-9]{1,2})\b(.*)$/i;
-				var m = dayRe.exec(date.part);
-				if(m) {
-					date.day = m[2];
-					date.part = m[1]+m[3];
-					Scholar.debug("DATE: got day ("+date.day+", "+date.part+")");
-				}
-			}
-		}
-		
-		if(date.part) {
-			date.part = date.part.replace(/^[^A-Za-z0-9]+/, "").replace(/[^A-Za-z0-9]+$/, "");
-		}
-		
-		return date;
-	}
 };
 
 
@@ -688,6 +602,7 @@ Scholar.Hash.prototype.has = function(in_key){
 
 Scholar.Date = new function(){
 	this.sqlToDate = sqlToDate;
+	this.strToDate = strToDate;
 	this.getFileDateString = getFileDateString;
 	this.getFileTimeString = getFileTimeString;
 	
@@ -721,6 +636,90 @@ Scholar.Date = new function(){
 		}
 	}
 	
+	/*
+	 * converts a string to an object containing:
+	 *    day: integer form of the day
+	 *    month: integer form of the month (indexed from 0, not 1)
+	 *    year: 4 digit year (or, year + BC/AD/etc.)
+	 *    part: anything that does not fall under any of the above categories
+	 *          (e.g., "Summer," etc.)
+	 */
+	function strToDate(string) {
+		var date = new Object();
+		
+		// skip empty things
+		if(!string) {
+			return date;
+		}
+		
+		// get short month strings from CSL interpreter
+		var months = CSL.getMonthStrings("short");
+		
+		string = string.replace(/^\s+/, "").replace(/\s+$/, "").replace(/\s+/, " ");
+		
+		var dateRe = /^([0-9]{4})[\-\/]([0-9]{2})[\-\/]([0-9]{2})$/;
+		var m = dateRe.exec(string);
+		if(m) {		// sql date
+			Scholar.debug("DATE: used form 1: SQL");
+			var jsDate = new Date(m[1], m[2]-1, m[3], false, false, false);
+		} else {	// not an sql date
+			var yearRe = /^((?:circa |around |about |c\.? ?)[0-9]{1,4}(?: ?B\.? ?C\.?(?: ?E\.?)?| ?C\.? ?E\.?| ?A\.? ?D\.?)|[0-9]{4})$/i;
+			if(yearRe.test(string)) {
+				// is just a year
+				Scholar.debug("DATE: used form 2: year-only");
+				date.year = string;
+				return date;
+			}
+			
+			// who knows what this is, but try JavaScript's date handling first
+			var jsDate = new Date(string)
+		}
+		
+		if(!isNaN(jsDate.valueOf())) {
+			Scholar.debug("DATE: retrieved from JavaScript");
+			// got a javascript date
+			date.year = jsDate.getFullYear();
+			date.month = jsDate.getMonth();
+			date.day = jsDate.getDate();
+			return date;
+		}
+		
+		// no javascript date. time for cruder things.
+		
+		// first, see if we have anything resembling a year
+		var yearRe = /^(.*)\b((?:circa |around |about |c\.? ?)[0-9]{1,4}(?: ?B\.? ?C\.?(?: ?E\.?)?| ?C\.? ?E\.?| ?A\.? ?D\.?)|[0-9]{4})\b(.*)$/i;
+		
+		var m = yearRe.exec(string);
+		if(m) {
+			date.year = m[2];
+			date.part = m[1]+m[3];
+			Scholar.debug("DATE: got year ("+date.year+", "+date.part+")");
+			
+			// then, see if have anything resembling a month anywhere
+			var monthRe = new RegExp("^(.*)\\b("+months.join("|")+")[^ ]* (.*)$", "i");
+			var m = monthRe.exec(date.part);
+			if(m) {
+				date.month = months.indexOf(m[2][0].toUpperCase()+m[2].substr(1).toLowerCase());
+				date.part = m[1]+m[3];
+				Scholar.debug("DATE: got month ("+date.month+", "+date.part+")");
+				
+				// then, see if there's a day 
+				var dayRe = /^(.*)\b([0-9]{1,2})\b(.*)$/i;
+				var m = dayRe.exec(date.part);
+				if(m) {
+					date.day = m[2];
+					date.part = m[1]+m[3];
+					Scholar.debug("DATE: got day ("+date.day+", "+date.part+")");
+				}
+			}
+		}
+		
+		if(date.part) {
+			date.part = date.part.replace(/^[^A-Za-z0-9]+/, "").replace(/[^A-Za-z0-9]+$/, "");
+		}
+		
+		return date;
+	}
 	
 	function getFileDateString(file){
 		var date = new Date();