View the DQSD CVS repository here:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dqsd/
Update of /cvsroot/dqsd/dqsd/addons/genealogy
In directory usw-pr-cvs1:/tmp/cvs-serv13499/addons/genealogy
Modified Files:
genealogy_lib.js
Log Message:
added genealogy_check_dqsd_version, added new date format to genealogy_parse_date
Index: genealogy_lib.js
===================================================================
RCS file: /cvsroot/dqsd/dqsd/addons/genealogy/genealogy_lib.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** genealogy_lib.js 3 Oct 2002 06:07:51 -0000 1.5
--- genealogy_lib.js 5 Oct 2002 05:26:05 -0000 1.6
***************
*** 1,9 ****
var genealogy_debug = 0;
! var genealogy_lib_version = "1.5";
var genealogy_month_names = new Array("JANUARY", "FEBRUARY", "MARCH", "APRIL",
"MAY", "JUNE", "JULY", "AUGUST", "SEPTEMBER", "OCTOBER", "NOVEMBER", "DECEMBER");
! var genealogy_date_format_1 =
"([0-9]{1,2})\\s*/\\s*([0-9]{1,2})\\s*/\\s*([0-9]{4})";
var genealogy_date_format_2 = "([0-9]{1,2})\\s+([a-zA-Z]{3,})\\s+([0-9]{4})";
! var genealogy_date_format_all =
"(("+genealogy_date_format_1+")|("+genealogy_date_format_2+"))";
var genealogy_states = new Array(
--- 1,10 ----
var genealogy_debug = 0;
! var genealogy_lib_version = "1.6";
var genealogy_month_names = new Array("JANUARY", "FEBRUARY", "MARCH", "APRIL",
"MAY", "JUNE", "JULY", "AUGUST", "SEPTEMBER", "OCTOBER", "NOVEMBER", "DECEMBER");
! var genealogy_date_format_1 =
"([0-9]{1,2})\\s*(?:/|-)\\s*([0-9]{1,2})\\s*(?:/|-)\\s*([0-9]{4})";
var genealogy_date_format_2 = "([0-9]{1,2})\\s+([a-zA-Z]{3,})\\s+([0-9]{4})";
! var genealogy_date_format_3 =
"([a-zA-Z]{3,})\\s+([0-9]{1,2})(?:\\s+|\\s*,\\s*)?([0-9]{4})";
! var genealogy_date_format_all =
"(("+genealogy_date_format_1+")|("+genealogy_date_format_2+")|("+genealogy_date_format_3+"))";
var genealogy_states = new Array(
***************
*** 630,633 ****
--- 631,635 ----
var dateFmt1RegExp = new RegExp(genealogy_date_format_1);
var dateFmt2RegExp = new RegExp(genealogy_date_format_2);
+ var dateFmt3RegExp = new RegExp(genealogy_date_format_3);
if ( (r = dateFmt1RegExp.exec(dateString)) != null) {
month = r[1]-1;
***************
*** 648,651 ****
--- 650,673 ----
}
}
+ } else if ( (r = dateFmt3RegExp.exec(dateString)) != null) {
+ day = r[2];
+ month = -1;
+ year = r[3];
+ var monthName = (r[1]).toUpperCase();
+ for (var i=0; i < genealogy_month_names.length; i++) {
+ if (monthName == genealogy_month_names[i] ||
+ monthName == genealogy_month_names[i].substring(0,3)) {
+ month = i;
+ valid_fmt = true;
+ break;
+ }
+ }
+ } else {
+ r = Date.parse(dateString);
+ if (r != null && !isNaN(r)) {
+ return new Date(r);
+ } else {
+ return false;
+ }
}
if (valid_fmt) {
***************
*** 661,663 ****
}
! genealogy_alert("genealogy_lib.js loaded");
\ No newline at end of file
--- 683,727 ----
}
! function genealogy_check_dqsd_version(majorHi, majorLo, minorHi, minorLo)
! {
! var bSuccess = true;
! var testObject;
!
! // First, see if we can create the object at all
! try
! {
! testObject = new ActiveXObject("DQSDTools.Launcher");
! }
! catch(e)
! {
! genealogy_error("The DQSD helper DLL is not correctly installed");
! bSuccess = false;
! }
!
! // Try a version query on it
! if(bSuccess)
! {
! try
! {
! // The DLL version has to be great than or equal to
! // this number
! if(!testObject.VersionIsCorrect(majorHi,majorLo,minorHi,minorLo))
! {
! bSuccess = false;
! }
! }
! catch(e)
! {
! genealogy_error("The DQSD helper DLL version couldn't be checked (error '" +
e.description + "').\nPlease reboot and run the setup program again.");
! bSuccess = false;
! }
! }
! testObject = null;
! return bSuccess;
! }
!
! genealogy_alert("genealogy_lib.js loaded");
!
! if (!genealogy_check_dqsd_version(3,1,4,0)) {
! genealogy_error("ERROR: The Genealogy Add-on requires Dave's Quick Search Bar
Version 3.1.4.0.");
! }
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
DQSD-CVS mailing list
https://lists.sourceforge.net/lists/listinfo/dqsd-cvs
DQSD CVS repository:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/dqsd/
