dlese-tools-proj — Recieves notifications of changes to the tools-project in the cvs repository

[Dlese-tools-proj] CVS: dlese-tools-project COPYRIGHT.txt, NONE, 1.1 LICENSE.txt, NONE, 1.1 COPYING, 1.1, NONE LICENSE, 1.1, NONE

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv10785

Added Files:
	COPYRIGHT.txt LICENSE.txt 
Removed Files:
	COPYING LICENSE 
Log Message:
updated license and copyright

--- NEW FILE ---
Copyright 2002 - 2007 DLESE Program Center, University Corporation for Atmospheric
Research (UCAR), P.O. Box 3000, Boulder, CO 80307.
	
When using, modifying or redistributing this software, please include the following acknowledgment:

	"This product includes software developed by the University Corporation for 
	Atmospheric Research (http://www.ucar.edu/), DLESE Program Center." 
 
This software is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free Software
Foundation; Version 2 of the License.

This software is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.

You should have received a copy of the GNU General Public License along with 
this software; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite
330, Boston, MA 02111-1307 USA

--- NEW FILE ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) year name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Library General
Public License instead of this License.

--- COPYING DELETED ---

--- LICENSE DELETED ---

[Dlese-tools-proj] CVS: dlese-tools-project/src/org/dlese/dpc/index/writer NewsOppsFileIndexingWriter.java, 1.14, 1.15

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/index/writer
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv32623/src/org/dlese/dpc/index/writer

Modified Files:
	NewsOppsFileIndexingWriter.java 
Log Message:
spelling...

Index: NewsOppsFileIndexingWriter.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/index/writer/NewsOppsFileIndexingWriter.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** NewsOppsFileIndexingWriter.java	31 Aug 2006 00:54:42 -0000	1.14
--- NewsOppsFileIndexingWriter.java	11 Apr 2007 22:18:31 -0000	1.15
***************
*** 67,71 ****
  	 *  Gets the docType attribute of the NewsOppsFileIndexingWriter, which is 'news_opps.'
  	 *
! 	 * @return    The docType, which is 'dlese_collect.'
  	 */
  	public String getDocType() {
--- 67,71 ----
  	 *  Gets the docType attribute of the NewsOppsFileIndexingWriter, which is 'news_opps.'
  	 *
! 	 * @return    The docType, which is 'news_opps.'
  	 */
  	public String getDocType() {

[Dlese-tools-proj] CVS: dlese-tools-project/src/org/dlese/dpc/xml Dom4jUtils.java, 1.6, 1.7

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/xml
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv20249/src/org/dlese/dpc/xml

Modified Files:
	Dom4jUtils.java 
Log Message:
-Ensure that reader is closed

Index: Dom4jUtils.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/xml/Dom4jUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Dom4jUtils.java	22 Oct 2005 00:20:43 -0000	1.6
--- Dom4jUtils.java	19 Mar 2007 17:01:54 -0000	1.7
***************
*** 107,111 ****
  		// No validation...
  		SAXReader reader = new SAXReader(false);
! 		Document document = reader.read(new StringReader(s));
  		return document;
  	}
--- 107,113 ----
  		// No validation...
  		SAXReader reader = new SAXReader(false);
! 		StringReader sr = new StringReader(s);
! 		Document document = reader.read(sr);
! 		sr.close();
  		return document;
  	}

[Dlese-tools-proj] CVS: dlese-tools-project/src/org/dlese/dpc/index/writer DleseCollectionFileIndexingWriter.java, 1.21, 1.22

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/index/writer
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv16624/src/org/dlese/dpc/index/writer

Modified Files:
	DleseCollectionFileIndexingWriter.java 
Log Message:
-Changed to read the file using getFileContent(), which reads content using utf-8 encoding

Index: DleseCollectionFileIndexingWriter.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/index/writer/DleseCollectionFileIndexingWriter.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** DleseCollectionFileIndexingWriter.java	31 Aug 2006 00:54:42 -0000	1.21
--- DleseCollectionFileIndexingWriter.java	19 Mar 2007 16:52:00 -0000	1.22
***************
*** 415,419 ****
  		}
  		else {
! 			xmlDoc = Dom4jUtils.localizeXml( Dom4jUtils.getXmlDocument( source ), "collectionRecord" );
  		}
  	}
--- 415,419 ----
  		}
  		else {
! 			xmlDoc = Dom4jUtils.localizeXml( Dom4jUtils.getXmlDocument( getFileContent() ), "collectionRecord" );
  		}
  	}

[Dlese-tools-proj] CVS: dlese-tools-project/build_lib lucene-1.1.jar, 1.1.1.1, NONE

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/build_lib
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv27105/build_lib

Removed Files:
	lucene-1.1.jar 
Log Message:
-Index writers now read to UTF-8 encoding. LC_CTYPE no longer needs to be set to UTF-8 in unix env for proper encoding.
-Removed obsolete lucene 1.1 classes and library (haven't been used for years)

--- lucene-1.1.jar DELETED ---

[Dlese-tools-proj] CVS: dlese-tools-project/src/org/dlese/dpc/index/writer FileIndexingServiceWriter.java, 1.45, 1.46

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/index/writer
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv27105/src/org/dlese/dpc/index/writer

Modified Files:
	FileIndexingServiceWriter.java 
Log Message:
-Index writers now read to UTF-8 encoding. LC_CTYPE no longer needs to be set to UTF-8 in unix env for proper encoding.
-Removed obsolete lucene 1.1 classes and library (haven't been used for years)

Index: FileIndexingServiceWriter.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/index/writer/FileIndexingServiceWriter.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** FileIndexingServiceWriter.java	29 Sep 2006 23:35:40 -0000	1.45
--- FileIndexingServiceWriter.java	19 Mar 2007 15:50:33 -0000	1.46
***************
*** 191,195 ****
  				fileContent = existingDoc.get("filecontent");
  			else if(source.exists())
! 				fileContent = Files.readFile(source).toString();
  			if(fileContent == null && existingDoc != null)
  				fileContent = existingDoc.get("filecontent");
--- 191,195 ----
  				fileContent = existingDoc.get("filecontent");
  			else if(source.exists())
! 				fileContent = Files.readFileToEncoding(source, "UTF-8").toString();
  			if(fileContent == null && existingDoc != null)
  				fileContent = existingDoc.get("filecontent");

[Dlese-tools-proj] CVS: dlese-tools-project/src/org/dlese/dpc/xml SearchIndex.java, 1.3, NONE

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/xml
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv27105/src/org/dlese/dpc/xml

Removed Files:
	SearchIndex.java 
Log Message:
-Index writers now read to UTF-8 encoding. LC_CTYPE no longer needs to be set to UTF-8 in unix env for proper encoding.
-Removed obsolete lucene 1.1 classes and library (haven't been used for years)

--- SearchIndex.java DELETED ---

[Dlese-tools-proj] CVS: dlese-tools-project/src/org/dlese/dpc/index DocumentIndex.java, 1.2, NONE

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/index
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv27105/src/org/dlese/dpc/index

Removed Files:
	DocumentIndex.java 
Log Message:
-Index writers now read to UTF-8 encoding. LC_CTYPE no longer needs to be set to UTF-8 in unix env for proper encoding.
-Removed obsolete lucene 1.1 classes and library (haven't been used for years)

--- DocumentIndex.java DELETED ---

[Dlese-tools-proj] CVS: dlese-tools-project/docs CHANGES.txt, 1.1, 1.2

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/docs
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv26865/docs

Modified Files:
	CHANGES.txt 
Log Message:
upped verstion to v1.4.5

Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/docs/CHANGES.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CHANGES.txt	13 Sep 2006 20:24:14 -0000	1.1
--- CHANGES.txt	23 Feb 2007 23:22:38 -0000	1.2
***************
*** 12,15 ****
--- 12,21 ----
  -----------------------------------------------------------------------------
  
+ Changes in v1.4.5
+ 
+ -Release corresponds with dds-project v3.3.7 and oai-project v3.0.9
+ (see CHANGES.txt in those projects for details).
+ 
+ 
  Changes in v1.4.4
  

[Dlese-tools-proj] CVS: dlese-tools-project build.xml,1.65,1.66

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv26865

Modified Files:
	build.xml 
Log Message:
upped verstion to v1.4.5

Index: build.xml
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/build.xml,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -r1.65 -r1.66
*** build.xml	18 Jan 2007 21:27:53 -0000	1.65
--- build.xml	23 Feb 2007 23:22:38 -0000	1.66
***************
*** 129,133 ****
  
    <property name="app.name"      				value="DLESETools"/>
!   <property name="app.version"   				value="1.4.4"/>
    <property name="build.home"    				value="build"/>
    <property name="build.lib"    				value="build_lib"/>
--- 129,133 ----
  
    <property name="app.name"      				value="DLESETools"/>
!   <property name="app.version"   				value="1.4.5"/>
    <property name="build.home"    				value="build"/>
    <property name="build.lib"    				value="build_lib"/>

[Dlese-tools-proj] CVS: dlese-tools-project/src/org/dlese/dpc/xml XMLConversionService.java, 1.23, 1.24 XSLTransformer.java, 1.14, 1.15

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/xml
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv13208/src/org/dlese/dpc/xml

Modified Files:
	XMLConversionService.java XSLTransformer.java 
Log Message:
-Fixed issue where corrupt XML data was being seen in the output from XSL 
format converters, which propogated as data corruption in the DDSWS web service
output (this caused CAS to throw an error) and OAI ListRecords and GetRecord responses. 
Fixed by applying sychronization in the XSLConversionService to address this concurrency-related issue.

Index: XMLConversionService.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/xml/XMLConversionService.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** XMLConversionService.java	17 Jan 2007 19:40:48 -0000	1.23
--- XMLConversionService.java	23 Feb 2007 21:20:00 -0000	1.24
***************
*** 533,540 ****
  
  				String content = null;
! 				if (originalXMLFile != null & originalXMLFile.canRead())
! 					content = XSLTransformer.transformFile(originalXMLFile, transformer);
! 				else if (luceneDoc != null)
! 					content = XSLTransformer.transformString(luceneDoc.getXml(), transformer);
  				
  				// Make sure the transformed content is not empty:
--- 533,546 ----
  
  				String content = null;
! 				if (originalXMLFile != null & originalXMLFile.canRead()) {
! 					synchronized(transformer){
! 						content = XSLTransformer.transformFile(originalXMLFile, transformer);
! 					}
! 				}
! 				else if (luceneDoc != null) {
! 					synchronized(transformer){
! 						content = XSLTransformer.transformString(luceneDoc.getXml(), transformer);
! 					}
! 				}
  				
  				// Make sure the transformed content is not empty:

Index: XSLTransformer.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/xml/XSLTransformer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** XSLTransformer.java	23 Feb 2007 02:09:08 -0000	1.14
--- XSLTransformer.java	23 Feb 2007 21:20:00 -0000	1.15
***************
*** 27,32 ****
  
  /**
!  *  Transforms files or Strings using XSL stylesheets. Note: some members of this class can be run as a
!  *  stand-alone class that can be invoked from the command line or from a servlet environment.
   *
   * @author     John Weatherley
--- 27,34 ----
  
  /**
!  *  Transforms files or Strings using XSL stylesheets. In general, Transformer objects are not thread safe, so
!  *  external synchornization should be applied in concurrent environments such as servlets. Note: some members
!  *  of this class can be run as a stand-alone class that can be invoked from the command line or from a
!  *  servlet environment.
   *
   * @author     John Weatherley

[Dlese-tools-proj] CVS: dlese-tools-project/src/org/dlese/dpc/xml XSLTransformer.java, 1.13, 1.14

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/xml
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv17645/src/org/dlese/dpc/xml

Modified Files:
	XSLTransformer.java 
Log Message:
-added new method to allow xsl supplied as a string
-fixed call to setSystemId in getTransformer method

Index: XSLTransformer.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/xml/XSLTransformer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** XSLTransformer.java	17 Jan 2007 18:06:17 -0000	1.13
--- XSLTransformer.java	23 Feb 2007 02:09:08 -0000	1.14
***************
*** 30,34 ****
   *  stand-alone class that can be invoked from the command line or from a servlet environment.
   *
!  * @author    John Weatherley
   */
  public class XSLTransformer {
--- 30,35 ----
   *  stand-alone class that can be invoked from the command line or from a servlet environment.
   *
!  * @author     John Weatherley
!  * @version    $Id$
   */
  public class XSLTransformer {
***************
*** 47,51 ****
  	//================================================================
  
! 	/**  Constructor does nothing. All processing done in the run() or static stand-alone methods.  */
  	public XSLTransformer() { }
  
--- 48,52 ----
  	//================================================================
  
! 	/**  Constructor does nothing. All processing done in the run() or static stand-alone methods. */
  	public XSLTransformer() { }
  
***************
*** 62,66 ****
  	 */
  	public StringBuffer transform(String xslFilePath, String inputFilesDir, String outputFilesDir)
! 			 throws Exception {
  		return transform(xslFilePath, inputFilesDir, null, outputFilesDir, null);
  	}
--- 63,67 ----
  	 */
  	public StringBuffer transform(String xslFilePath, String inputFilesDir, String outputFilesDir)
! 		 throws Exception {
  		return transform(xslFilePath, inputFilesDir, null, outputFilesDir, null);
  	}
***************
*** 83,91 ****
  	 */
  	public StringBuffer transform(String xslFilePath,
! 			String inputFilesDir,
! 			String[] inputFileNames,
! 			String outputFilesDir,
! 			Date modifiedSinceDate)
! 			 throws Exception {
  		buff.append(new java.util.Date().toString() + " Starting transformations\n");
  
--- 84,92 ----
  	 */
  	public StringBuffer transform(String xslFilePath,
! 	                              String inputFilesDir,
! 	                              String[] inputFileNames,
! 	                              String outputFilesDir,
! 	                              Date modifiedSinceDate)
! 		 throws Exception {
  		buff.append(new java.util.Date().toString() + " Starting transformations\n");
  
***************
*** 107,117 ****
  
  		// Create reader
! 		
  		File xslFile = new File(xslFilePath);
  		StreamSource stream = new StreamSource(new FileInputStream(xslFile));
! 		
  		// Set systemId so xsl style sheets can find relative style sheets referenced in include and import directives
  		stream.setSystemId(xslFile);
! 		Transformer transformer = tFactory.newTransformer(stream);	
  
  		Date start = new Date();
--- 108,118 ----
  
  		// Create reader
! 
  		File xslFile = new File(xslFilePath);
  		StreamSource stream = new StreamSource(new FileInputStream(xslFile));
! 
  		// Set systemId so xsl style sheets can find relative style sheets referenced in include and import directives
  		stream.setSystemId(xslFile);
! 		Transformer transformer = tFactory.newTransformer(stream);
  
  		Date start = new Date();
***************
*** 158,163 ****
  				} catch (Exception e) {
  					buff.append("XSLT error on record "
! 							 + inputFiles[i]
! 							 + ": " + e.getMessage() + "\n");
  					numRecordsError++;
  				}
--- 159,164 ----
  				} catch (Exception e) {
  					buff.append("XSLT error on record "
! 						 + inputFiles[i]
! 						 + ": " + e.getMessage() + "\n");
  					numRecordsError++;
  				}
***************
*** 178,183 ****
  				if (modifiedSinceDate == null || (inputDir.lastModified() >= modifiedSinceDate.getTime())) {
  					transformToFile(inputFilesDir,
! 							outputDir.getAbsolutePath() + "/" + inputDir.getName(),
! 							transformer);
  					numRecordsSuccess++;
  				}
--- 179,184 ----
  				if (modifiedSinceDate == null || (inputDir.lastModified() >= modifiedSinceDate.getTime())) {
  					transformToFile(inputFilesDir,
! 						outputDir.getAbsolutePath() + "/" + inputDir.getName(),
! 						transformer);
  					numRecordsSuccess++;
  				}
***************
*** 225,229 ****
  	 */
  	public final static void transformToFile(String inputFilePath, String outputFilePath, Transformer transformer)
! 			 throws Exception {
  		transformToFile(new File(inputFilePath), new FileOutputStream(outputFilePath), transformer);
  	}
--- 226,230 ----
  	 */
  	public final static void transformToFile(String inputFilePath, String outputFilePath, Transformer transformer)
! 		 throws Exception {
  		transformToFile(new File(inputFilePath), new FileOutputStream(outputFilePath), transformer);
  	}
***************
*** 239,243 ****
  	 */
  	public final static void transformToFile(File inputFile, File outputFile, Transformer transformer)
! 			 throws Exception {
  		transformToFile(inputFile, new FileOutputStream(outputFile), transformer);
  	}
--- 240,244 ----
  	 */
  	public final static void transformToFile(File inputFile, File outputFile, Transformer transformer)
! 		 throws Exception {
  		transformToFile(inputFile, new FileOutputStream(outputFile), transformer);
  	}
***************
*** 253,263 ****
  	 */
  	public final static void transformToFile(File inputFile, FileOutputStream fos, Transformer transformer)
! 			 throws Exception {
  		OutputStreamWriter writer = new OutputStreamWriter(fos, "UTF-8");
  		transformer.transform(
  		// Must use FileInputStream so that escaped filename chars like %3A work.
! 				new StreamSource(new FileInputStream(inputFile)),
! 				new StreamResult(writer)
! 				);
  		fos.close();
  		writer.close();
--- 254,264 ----
  	 */
  	public final static void transformToFile(File inputFile, FileOutputStream fos, Transformer transformer)
! 		 throws Exception {
  		OutputStreamWriter writer = new OutputStreamWriter(fos, "UTF-8");
  		transformer.transform(
  		// Must use FileInputStream so that escaped filename chars like %3A work.
! 			new StreamSource(new FileInputStream(inputFile)),
! 			new StreamResult(writer)
! 			);
  		fos.close();
  		writer.close();
***************
*** 436,439 ****
--- 437,469 ----
  
  	/**
+ 	 *  Transforms an XML String using an XSL stylesheet supplied as a String.
+ 	 *
+ 	 * @param  xmlString  The XML String to transform.
+ 	 * @param  xslString  The XSL String used to define the transform.
+ 	 * @return            A String containing the transformed content.
+ 	 */
+ 	public final static String transformStringUsingString(String xmlString, String xslString) {
+ 		try {
+ 			return transformString(xmlString, getTransformerFromXSLString(xslString));
+ 		} catch (Throwable e) {
+ 			prtlnErr(e);
+ 			return "";
+ 		}
+ 	}
+ 
+ 
+ 	/**
+ 	 *  Removes all namespace information from XML.
+ 	 *
+ 	 * @param  xmlString  The XML String to strip of namespaces
+ 	 * @return            A String containing XML without namespaces
+ 	 * @see               #XSLUtils.getRemoveNamespacesXSL()
+ 	 */
+ 	public final static String localizeXml(String xmlString) {
+ 		return transformStringUsingString(xmlString, XSLUtils.getRemoveNamespacesXSL());
+ 	}
+ 
+ 
+ 	/**
  	 *  Transforms an XML String using an XSL stylesheet. To convert the resulting StringWriter to a String, call
  	 *  StringWriter.toString().
***************
*** 465,478 ****
  	 */
  	public final static Transformer getTransformer(String xslFilePath)
! 			 throws TransformerConfigurationException, FileNotFoundException {
  		TransformerFactory tFactory = TransformerFactory.newInstance();
! 		
  		File xslFile = new File(xslFilePath);
  		StreamSource stream = new StreamSource(new FileInputStream(xslFile));
! 		
  		// Set systemId so xsl style sheets can find relative style sheets referenced in include and import directives
  		stream.setSystemId(xslFile);
! 		Transformer transformer = tFactory.newTransformer(stream);	
! 		return tFactory.newTransformer(new StreamSource(new FileInputStream(new File(xslFilePath))));
  	}
  
--- 495,527 ----
  	 */
  	public final static Transformer getTransformer(String xslFilePath)
! 		 throws TransformerConfigurationException, FileNotFoundException {
  		TransformerFactory tFactory = TransformerFactory.newInstance();
! 
  		File xslFile = new File(xslFilePath);
  		StreamSource stream = new StreamSource(new FileInputStream(xslFile));
! 
  		// Set systemId so xsl style sheets can find relative style sheets referenced in include and import directives
  		stream.setSystemId(xslFile);
! 		return tFactory.newTransformer(stream);
! 	}
! 
! 
! 	/**
! 	 *  Gets a {@link javax.xml.transform.Transformer} used to transform XML using a given XSL stylesheet. For
! 	 *  efficiency, one {@link javax.xml.transform.Transformer} should be used to transform multiple XMLs from a
! 	 *  single stylesheet.
! 	 *
! 	 * @param  xslString                              XSL supplied as a String
! 	 * @return                                        A Transformer used to transform XML using a given
! 	 *      stylesheet.
! 	 * @exception  TransformerConfigurationException  If error.
! 	 */
! 	public final static Transformer getTransformerFromXSLString(String xslString)
! 		 throws TransformerConfigurationException {
! 		TransformerFactory tFactory = TransformerFactory.newInstance();
! 
! 		StreamSource stream = new StreamSource(new StringReader(xslString));
! 
! 		return tFactory.newTransformer(stream);
  	}
  
***************
*** 488,492 ****
  	 */
  	private void mkdirs(String path)
! 			 throws Exception {
  		String errorMsg = null;
  		File f = new File(path);
--- 537,541 ----
  	 */
  	private void mkdirs(String path)
! 		 throws Exception {
  		String errorMsg = null;
  		File f = new File(path);
***************
*** 497,502 ****
  		else if (f.isFile()) {
  			errorMsg = "Error creating directory "
! 					 + path
! 					 + ": Path leads to a file, not a directory.";
  			throw new Exception(errorMsg);
  		}
--- 546,551 ----
  		else if (f.isFile()) {
  			errorMsg = "Error creating directory "
! 				 + path
! 				 + ": Path leads to a file, not a directory.";
  			throw new Exception(errorMsg);
  		}
***************
*** 509,513 ****
  			} catch (Exception e) {
  				errorMsg = "Error creating directory \""
! 						 + path + ": " + e.getMessage();
  				throw new Exception(errorMsg);
  			}
--- 558,562 ----
  			} catch (Exception e) {
  				errorMsg = "Error creating directory \""
! 					 + path + ": " + e.getMessage();
  				throw new Exception(errorMsg);
  			}
***************
*** 542,549 ****
  			if (Character.isLetterOrDigit(chr) ||
  			//chr == ':' || // unfortunatly colons don't work in Windows
! 					chr == '-' ||
! 					chr == '_' ||
! 					chr == '%' ||
! 					chr == '.')
  				outbuf.append(chr);
  			else
--- 591,598 ----
  			if (Character.isLetterOrDigit(chr) ||
  			//chr == ':' || // unfortunatly colons don't work in Windows
! 				chr == '-' ||
! 				chr == '_' ||
! 				chr == '%' ||
! 				chr == '.')
  				outbuf.append(chr);
  			else
***************
*** 587,591 ****
  	 *  Filter .xml files only
  	 *
! 	 * @author    John Weatherley
  	 */
  	class XMLFileFilter implements FilenameFilter {
--- 636,641 ----
  	 *  Filter .xml files only
  	 *
! 	 * @author     John Weatherley
! 	 * @version    $Id$
  	 */
  	class XMLFileFilter implements FilenameFilter {
***************
*** 613,617 ****
  	protected final static String getDateStamp() {
  		return
! 				new SimpleDateFormat("MMM d, yyyy h:mm:ss a zzz").format(new Date());
  	}
  
--- 663,667 ----
  	protected final static String getDateStamp() {
  		return
! 			new SimpleDateFormat("MMM d, yyyy h:mm:ss a zzz").format(new Date());
  	}
  
***************
*** 638,642 ****
  	}
  
! 	
  	/**
  	 *  Output a line of text to error out, with datestamp.
--- 688,692 ----
  	}
  
! 
  	/**
  	 *  Output a line of text to error out, with datestamp.
***************
*** 647,651 ****
  		System.err.println(getDateStamp() + " XSLTransformer ERROR: " + t);
  		t.printStackTrace();
! 	}	
  
  	/**
--- 697,702 ----
  		System.err.println(getDateStamp() + " XSLTransformer ERROR: " + t);
  		t.printStackTrace();
! 	}
! 
  
  	/**

[Dlese-tools-proj] CVS: dlese-tools-project/scripts harvest, 1.6, 1.7

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv8075/scripts

Modified Files:
	harvest 
Log Message:


Index: harvest
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/scripts/harvest,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** harvest	2 Nov 2006 00:02:02 -0000	1.6
--- harvest	18 Jan 2007 21:42:56 -0000	1.7
***************
*** 56,60 ****
  echo ""
  echo " Example: harvest . http://www.dlese.org/oai/provider adn"
! echo " Example: harvest . http://www.dlese.org/oai/provider oai_dc dcc"
  echo " Example: harvest /usr/home/myHarvestDir http://www.dlese.org/oai/provider oai_dc -set:dcc -from:2003-01-02T04:35:46Z -until:2003-04-02T04:35:46Z -splitBySet:true -writeHeaders:true"
  echo ""
--- 56,60 ----
  echo ""
  echo " Example: harvest . http://www.dlese.org/oai/provider adn"
! echo " Example: harvest . http://www.dlese.org/oai/provider oai_dc -set:dcc"
  echo " Example: harvest /usr/home/myHarvestDir http://www.dlese.org/oai/provider oai_dc -set:dcc -from:2003-01-02T04:35:46Z -until:2003-04-02T04:35:46Z -splitBySet:true -writeHeaders:true"
  echo ""

[Dlese-tools-proj] CVS: dlese-tools-project/scripts transform, 1.6, 1.7 transform2, 1.2, 1.3

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv6955/scripts

Modified Files:
	transform transform2 
Log Message:


Index: transform
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/scripts/transform,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** transform	18 Jan 2007 20:00:48 -0000	1.6
--- transform	18 Jan 2007 21:39:28 -0000	1.7
***************
*** 43,46 ****
--- 43,47 ----
  echo "Using classpath: $CP"
  #echo "Using properties: $props"
+ echo ""
  
  if( $#argv == 1 ) then

Index: transform2
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/scripts/transform2,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** transform2	18 Jan 2007 21:27:53 -0000	1.2
--- transform2	18 Jan 2007 21:39:28 -0000	1.3
***************
*** 47,50 ****
--- 47,52 ----
  echo "Using classpath: $CP"
  echo "Using properties: $props"
+ echo "Usint saxon XSLT 2.0 processor"
+ echo ""
  
  if( $#argv == 1 ) then

[Dlese-tools-proj] CVS: dlese-tools-project build.xml,1.64,1.65

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv2586

Modified Files:
	build.xml 
Log Message:
updated transform2 to build with saxon XSLT 2 processor in path

Index: build.xml
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/build.xml,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** build.xml	18 Jan 2007 20:00:48 -0000	1.64
--- build.xml	18 Jan 2007 21:27:53 -0000	1.65
***************
*** 266,270 ****
    </target>
  
! 
  
  <!-- ==================== Compile Target ================================== -->
--- 266,273 ----
    </target>
  
!   <target name="deploy-clean"
!    description="Delete old deploy directory">
!     <delete dir="${tools.deploy.home}"/>
!   </target>
  
  <!-- ==================== Compile Target ================================== -->
***************
*** 400,404 ****
  	<copy    todir="${tools.deploy.home}/lib">
        <fileset dir="${build.lib}" 
!           includes="**/xerces*,saxon*" />
      </copy>
  	<copy    todir="${tools.deploy.home}/lib">
--- 403,407 ----
  	<copy    todir="${tools.deploy.home}/lib">
        <fileset dir="${build.lib}" 
!           includes="**/xerces*" />
      </copy>
  	<copy    todir="${tools.deploy.home}/lib">
***************
*** 406,409 ****
--- 409,416 ----
            includes="**/xerces*" />
      </copy>
+ 	<copy    todir="${tools.deploy.home}/lib/lib-xslt-2">
+       <fileset dir="${build.lib}" 
+           includes="saxon*" />
+     </copy>	
      
  	<echo message="Setting execution permissions in ${tools.deploy.home}/bin (works on UNIX only)"/>

[Dlese-tools-proj] CVS: dlese-tools-project/scripts transform2, 1.1, 1.2

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv2586/scripts

Modified Files:
	transform2 
Log Message:
updated transform2 to build with saxon XSLT 2 processor in path

Index: transform2
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/scripts/transform2,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** transform2	18 Jan 2007 20:00:48 -0000	1.1
--- transform2	18 Jan 2007 21:27:53 -0000	1.2
***************
*** 41,44 ****
--- 41,48 ----
  end
  
+ foreach file ($DLESE_TOOLS_HOME/lib-xslt-2/*.jar)
+ 	set CP = $CP$file\:
+ end
+ 
  echo "Using classpath: $CP"
  echo "Using properties: $props"

[Dlese-tools-proj] CVS: dlese-tools-project/scripts transform2, NONE, 1.1 transform, 1.5, 1.6

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv2280/scripts

Modified Files:
	transform 
Added Files:
	transform2 
Log Message:
Updated transform scripts with a new version that allows use of the saxon XSLT 2.0 compliant processor

--- NEW FILE ---
#!/bin/csh

# This script transforms a directory of xml files or a single xml file using an xsl stylesheet. 
# Parameters are read from a java properties file or from the command line.
#
# Uses the saxon XSLT 2.0 compliant processor
#
# This script assumes the following environmental variables have been set:
#
# JAVA_HOME = The base directory of a Java j2sdk v1.4 or later
# 
# DLESE_TOOLS_HOME = The home directory of the DLESETools.jar and xercesImpl-x.x.x.jar.
#
# Author: John Weatherley


### Define the path the Java JVM or SDK:
#set JAVA_HOME = /path/to/java/jvm/

### Define the path to the directory where DLESETools.jar and xercesImpl-x.x.x.jar are located:
#set DLESE_TOOLS_HOME = /path/to/required/jar/files/lib/

# Use the saxon XSLT 2.0 TransformerFactory...
set props = "-Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl"

set CP = ""

if($?DLESE_TOOLS_HOME == 0) then
	echo "DLESE_TOOLS_HOME is not set"
	exit 1
endif			

if($?JAVA_HOME == 0) then
	echo "JAVA_HOME is not set"
	exit 1
endif

# Construct the classpath
foreach file ($DLESE_TOOLS_HOME/*.jar)
	set CP = $CP$file\:
end

echo "Using classpath: $CP"
echo "Using properties: $props"

if( $#argv == 1 ) then
	if( $argv[1] != "-h" && $argv[1] != "--help" ) then
		$JAVA_HOME/bin/java $props -cp $CP org.dlese.dpc.commands.RunXSLTransform $argv[1]
		exit 0
	endif
else if( $#argv == 3 ) then
	$JAVA_HOME/bin/java $props -cp $CP org.dlese.dpc.commands.RunXSLTransform $argv[1] $argv[2] $argv[3] null false false
	exit 0
else if( $#argv == 4 ) then
	$JAVA_HOME/bin/java $props -cp $CP org.dlese.dpc.commands.RunXSLTransform $argv[1] $argv[2] $argv[3] $argv[4] false false
	exit 0
else if( $#argv == 5 ) then
	$JAVA_HOME/bin/java $props -cp $CP org.dlese.dpc.commands.RunXSLTransform $argv[1] $argv[2] $argv[3] $argv[4] $argv[5] false
	exit 0
else if( $#argv == 6 ) then
	$JAVA_HOME/bin/java $props -cp $CP org.dlese.dpc.commands.RunXSLTransform $argv[1] $argv[2] $argv[3] $argv[4] $argv[5] $argv[6]
	exit 0
endif

# If we've gotten this far, send usage msg:
echo "USAGE: transform2 props_file.properties"
echo "         where:"
echo "                props_file.properties = a java properties file that contains:"
echo "                  xslFile = the stylsheet used for the transform"
echo "                  inputDir = the input xml file or directory containing xml files"
echo "                  outputDir = the directory where the output files will be placed"
echo "                  modifiedSinceDate = a date in UTCdatetime format (YYYY-MM-DDThh:mm:ssZ) that indicates"
echo "                                      the transform should be performed only if a given input file has"
echo "                                      been modified since that date, or the string 'null' to transform regardless"
echo "                  validateInputFiles [true|FALSE] = optional parameter indicating whether to validate input file(s)"
echo "                  validateOutputFiles [true|FALSE] = optional parameter indicating whether to validate output file(s)"
echo ""                    
echo "          --- or ---"
echo ""
echo "USAGE: transform2 stylesheet.xsl input output_dir [ modifiedSinceDate [true|FALSE] [true|FALSE] ]"
echo "         where:"
echo "                stylesheet.xsl = the stylsheet used for the transform"
echo "                input = the input xml file or directory containing xml files"
echo "                output_dir = the directory where the output files will be placed"
echo "                modifiedSinceDate = optional parameter in UTCdatetime format (YYYY-MM-DDThh:mm:ssZ) that indicates"
echo "                                    the transform should be performed only if a given input file has been modified"
echo "                                    since that date, or the string 'null' to transform regardless"
echo "                [true|FALSE] = optional parameter indicating whether to validate input file(s)"
echo "                [true|FALSE] = optional parameter indicating whether to validate output file(s)"
echo ""
exit 1

Index: transform
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/scripts/transform,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** transform	1 Nov 2006 22:13:50 -0000	1.5
--- transform	18 Jan 2007 20:00:48 -0000	1.6
***************
*** 4,7 ****
--- 4,9 ----
  # Parameters are read from a java properties file or from the command line.
  #
+ # Uses the default XSLT processor (currently XSLT 1.0 compliant)
+ #
  # This script assumes the following environmental variables have been set:
  #
***************
*** 19,22 ****
--- 21,27 ----
  #set DLESE_TOOLS_HOME = /path/to/required/jar/files/lib/
  
+ # Use the default TransformerFactory rather than setting it here...
+ set props = ""
+ 
  set CP = ""
  
***************
*** 36,56 ****
  end
  
  
  if( $#argv == 1 ) then
  	if( $argv[1] != "-h" && $argv[1] != "--help" ) then
! 		$JAVA_HOME/bin/java -cp $CP org.dlese.dpc.commands.RunXSLTransform $argv[1]
  		exit 0
  	endif
  else if( $#argv == 3 ) then
! 	$JAVA_HOME/bin/java -cp $CP org.dlese.dpc.commands.RunXSLTransform $argv[1] $argv[2] $argv[3] null false false
  	exit 0
  else if( $#argv == 4 ) then
! 	$JAVA_HOME/bin/java -cp $CP org.dlese.dpc.commands.RunXSLTransform $argv[1] $argv[2] $argv[3] $argv[4] false false
  	exit 0
  else if( $#argv == 5 ) then
! 	$JAVA_HOME/bin/java -cp $CP org.dlese.dpc.commands.RunXSLTransform $argv[1] $argv[2] $argv[3] $argv[4] $argv[5] false
  	exit 0
  else if( $#argv == 6 ) then
! 	$JAVA_HOME/bin/java -cp $CP org.dlese.dpc.commands.RunXSLTransform $argv[1] $argv[2] $argv[3] $argv[4] $argv[5] $argv[6]
  	exit 0
  endif
--- 41,63 ----
  end
  
+ echo "Using classpath: $CP"
+ #echo "Using properties: $props"
  
  if( $#argv == 1 ) then
  	if( $argv[1] != "-h" && $argv[1] != "--help" ) then
! 		$JAVA_HOME/bin/java $props -cp $CP org.dlese.dpc.commands.RunXSLTransform $argv[1]
  		exit 0
  	endif
  else if( $#argv == 3 ) then
! 	$JAVA_HOME/bin/java $props -cp $CP org.dlese.dpc.commands.RunXSLTransform $argv[1] $argv[2] $argv[3] null false false
  	exit 0
  else if( $#argv == 4 ) then
! 	$JAVA_HOME/bin/java $props -cp $CP org.dlese.dpc.commands.RunXSLTransform $argv[1] $argv[2] $argv[3] $argv[4] false false
  	exit 0
  else if( $#argv == 5 ) then
! 	$JAVA_HOME/bin/java $props -cp $CP org.dlese.dpc.commands.RunXSLTransform $argv[1] $argv[2] $argv[3] $argv[4] $argv[5] false
  	exit 0
  else if( $#argv == 6 ) then
! 	$JAVA_HOME/bin/java $props -cp $CP org.dlese.dpc.commands.RunXSLTransform $argv[1] $argv[2] $argv[3] $argv[4] $argv[5] $argv[6]
  	exit 0
  endif

[Dlese-tools-proj] CVS: dlese-tools-project build.xml,1.63,1.64

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv2280

Modified Files:
	build.xml 
Log Message:
Updated transform scripts with a new version that allows use of the saxon XSLT 2.0 compliant processor

Index: build.xml
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/build.xml,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -r1.63 -r1.64
*** build.xml	13 Sep 2006 20:23:46 -0000	1.63
--- build.xml	18 Jan 2007 20:00:48 -0000	1.64
***************
*** 400,404 ****
  	<copy    todir="${tools.deploy.home}/lib">
        <fileset dir="${build.lib}" 
!           includes="**/xerces*" />
      </copy>
  	<copy    todir="${tools.deploy.home}/lib">
--- 400,404 ----
  	<copy    todir="${tools.deploy.home}/lib">
        <fileset dir="${build.lib}" 
!           includes="**/xerces*,saxon*" />
      </copy>
  	<copy    todir="${tools.deploy.home}/lib">
***************
*** 456,460 ****
  -->
  
!   <target name="dist" depends="deploy,javadoc"
     description="Create binary distribution with documentation">
  
--- 456,460 ----
  -->
  
!   <target name="dist" depends="deploy"
     description="Create binary distribution with documentation">
  

[Dlese-tools-proj] CVS: dlese-tools-project/build_lib saxon8.jar, NONE, 1.1

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/build_lib
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv23125/build_lib

Added Files:
	saxon8.jar 
Log Message:
added xslt 2.0 compliant processor. To use, set the system property javax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl

--- NEW FILE ---
PK


Created-By: 1.4.2_11 (Sun Microsystems Inc.)
Main-Class: net.sf.saxon.Transform

PK

­$5_Ÿ OM










[...31345 lines suppressed...]

[Dlese-tools-proj] CVS: dlese-tools-project/src/org/dlese/dpc/xml XMLConversionService.java, 1.22, 1.23

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/xml
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv21442/src/org/dlese/dpc/xml

Modified Files:
	XMLConversionService.java 
Log Message:
transformer no longer writes the cached  file if the transformed content is empty. This ensures that the transform will be attemped again the next time the given record/format is requested by a harvester.

Index: XMLConversionService.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/xml/XMLConversionService.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** XMLConversionService.java	18 May 2006 01:58:21 -0000	1.22
--- XMLConversionService.java	17 Jan 2007 19:40:48 -0000	1.23
***************
*** 1,723 ****
! 
! /**
!  *  Copyright 2002, 2003 DLESE Program Center/University Corporation for Atmospheric Research (UCAR), P.O. Box
!  *  3000, Boulder, CO 80307, su...@dl....<p>
!  *
!  *  This file is part of the DLESE Tools Project.<p>
!  *
!  *  The DLESE Tools Project is free software; you can redistribute it and/or modify it under the terms of the
!  *  GNU General Public License as published by the Free Software Foundation; either version 2 of the License,
!  *  or (at your option) any later version.<p>
[...1440 lines suppressed...]
! 	 *  Output a line of text to standard out, with datestamp, if debug is set to true.
! 	 *
! 	 * @param  s  The String that will be output.
! 	 */
! 	private final void prtln(String s) {
! 		if (debug)
! 			System.out.println(getDateStamp() + " " + s);
! 	}
! 
! 
! 	/**
! 	 *  Sets the debug attribute of the SimpleLuceneIndex object
! 	 *
! 	 * @param  db  The new debug value
! 	 */
! 	public final static void setDebug(boolean db) {
! 		debug = db;
! 	}
! }
! 

[Dlese-tools-proj] CVS: dlese-tools-project/src/org/dlese/dpc/xml XSLTransformer.java, 1.12, 1.13

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/xml
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv20158/src/org/dlese/dpc/xml

Modified Files:
	XSLTransformer.java 
Log Message:
made sure to call setSystemId() with file in one other place

Index: XSLTransformer.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/xml/XSLTransformer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** XSLTransformer.java	12 Jan 2007 20:37:56 -0000	1.12
--- XSLTransformer.java	17 Jan 2007 18:06:17 -0000	1.13
***************
*** 303,307 ****
  		try {
  			StringWriter writer = new StringWriter();
! 			transformer.transform(new StreamSource(new FileInputStream(inputFile)), new StreamResult(writer));
  			return writer.toString();
  		} catch (Throwable e) {
--- 303,309 ----
  		try {
  			StringWriter writer = new StringWriter();
! 			StreamSource ss = new StreamSource(new FileInputStream(inputFile));
! 			ss.setSystemId(inputFile);
! 			transformer.transform(ss, new StreamResult(writer));
  			return writer.toString();
  		} catch (Throwable e) {

[Dlese-tools-proj] CVS: dlese-tools-project/src/org/dlese/dpc/oai/harvester Harvester.java, 1.48, 1.49

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/oai/harvester
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv14859/src/org/dlese/dpc/oai/harvester

Modified Files:
	Harvester.java 
Log Message:
Documentation

Index: Harvester.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/oai/harvester/Harvester.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** Harvester.java	13 Jan 2007 01:00:47 -0000	1.48
--- Harvester.java	17 Jan 2007 16:18:24 -0000	1.49
***************
*** 331,335 ****
  	 * @param  msgHandler           The HarvestMessageHandler that will receive messages as the harvest
  	 *      progresses, or null if none.
! 	 * @param  timeOutMilliseconds  NOT YET DOCUMENTED
  	 */
  	public Harvester(HarvestMessageHandler msgHandler, int timeOutMilliseconds) {
--- 331,336 ----
  	 * @param  msgHandler           The HarvestMessageHandler that will receive messages as the harvest
  	 *      progresses, or null if none.
! 	 * @param  timeOutMilliseconds  Number of milliseconds the harvester will wait for a response from the data
! 	 *      provider before timing out
  	 */
  	public Harvester(HarvestMessageHandler msgHandler, int timeOutMilliseconds) {
***************
*** 442,448 ****
  	 *  Recursively delete the contents of a directory.
  	 *
! 	 * @param  dir            NOT YET DOCUMENTED
! 	 * @return                NOT YET DOCUMENTED
! 	 * @exception  Throwable  NOT YET DOCUMENTED
  	 */
  	private static boolean deleteDir(File dir) throws Throwable {
--- 443,449 ----
  	 *  Recursively delete the contents of a directory.
  	 *
! 	 * @param  dir            The dir to delete
! 	 * @return                True if successful
! 	 * @exception  Throwable  If error
  	 */
  	private static boolean deleteDir(File dir) throws Throwable {
***************
*** 535,543 ****
  			z = 0;
  		prtln("Count at beginning is " + z);
- 
  		if ((splitBySet != true) && (recordCount != z)) {
  			recordCount = z;
  		} */
- 
  		synchronized (this) {
  			if (hasDoneHarvest) {
--- 536,542 ----
***************
*** 720,724 ****
  			}
  			prtln("recordCount is " + recordCount); */
- 
  			//Create a zip file of this harvest so that it can be directly downloaded from the UI
  			File harvestedToDir = new File(outdir);
--- 719,722 ----
***************
*** 746,750 ****
  				ZipFile zipFile = new ZipFile(fullZipFileName);
  
- 				
  
  				zipFile.compress(harvestedToDir.getAbsolutePath());
--- 744,747 ----
***************
*** 821,829 ****
  	 * @param  dir             the directory in question
  	 * @return                 the total number of files in dir
! 	 * @exception  Hexception  NOT YET DOCUMENTED
  	 */
  	private int Count(File dir) throws Hexception {
  		//return 0;
! 		
  		if (!dir.isDirectory()) {
  			throw new Hexception("File " + dir.getName() + " is not a directory.");
--- 818,826 ----
  	 * @param  dir             the directory in question
  	 * @return                 the total number of files in dir
! 	 * @exception  Hexception  If error
  	 */
  	private int Count(File dir) throws Hexception {
  		//return 0;
! 
  		if (!dir.isDirectory()) {
  			throw new Hexception("File " + dir.getName() + " is not a directory.");
***************
*** 1022,1026 ****
  		// if omitted, use default
  
! 		// Place the harvested records in an array if no output dir is specified 
  		if (outdir == null) {
  			if (deleted) {
--- 1019,1023 ----
  		// if omitted, use default
  
! 		// Place the harvested records in an array if no output dir is specified
  		if (outdir == null) {
  			if (deleted) {
***************
*** 1047,1052 ****
  			}
  		}
! 		
! 		// Save the harvested records to files if output dir is specified 
  		else {
  			Iterator iter = setlist.iterator();
--- 1044,1049 ----
  			}
  		}
! 
! 		// Save the harvested records to files if output dir is specified
  		else {
  			Iterator iter = setlist.iterator();
***************
*** 1086,1098 ****
  				}
  			}
! 			
! 			if(savedAtLeastOne)
  				recordCount++;
! 			
  			if (recordCount % messagingNum == 0) {
  				if (msgHandler != null) {
  					msgHandler.statusMessage(recordCount, resumpCount);
  				}
! 			}			
  		}
  	}
--- 1083,1095 ----
  				}
  			}
! 
! 			if (savedAtLeastOne)
  				recordCount++;
! 
  			if (recordCount % messagingNum == 0) {
  				if (msgHandler != null) {
  					msgHandler.statusMessage(recordCount, resumpCount);
  				}
! 			}
  		}
  	}

[Dlese-tools-proj] CVS: dlese-tools-project/src/org/dlese/dpc/oai/harvester Harvester.java, 1.47, 1.48 OAIHarvesterServlet.java, 1.16, 1.17 ScheduledHarvestManager.java, 1.20, 1.21

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/oai/harvester
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv16331/src/org/dlese/dpc/oai/harvester

Modified Files:
	Harvester.java OAIHarvesterServlet.java 
	ScheduledHarvestManager.java 
Log Message:
-Fixed bug that caused the harvester to slow increasingly as the number of harvested records grew. 
-Fixed the way the Harvester calculates the number of records harvested
-Provided a mechasm to programatically set the time out period for the harvester

Index: Harvester.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/oai/harvester/Harvester.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** Harvester.java	2 Nov 2006 00:02:02 -0000	1.47
--- Harvester.java	13 Jan 2007 01:00:47 -0000	1.48
***************
*** 42,50 ****
   *  to file or returning the raw XML as an array of Strings. Supports data providers that use resumption
   *  tokens for <a href="http://www.openarchives.org/OAI/2.0/openarchivesprotocol.htm#FlowControl"> flow
!  *  control</a>, selective harvesting by <a href="http://www.openarchives.org/OAI/2.0/openarchivesprotocol.htm#SelectiveHarvestingandDatestamps">
   *  date</a> or <a href="http://www.openarchives.org/OAI/2.0/openarchivesprotocol.htm#SelectiveHarvestingandSets">
!  *  set</a>, gzip <a href="http://www.openarchives.org/OAI/2.0/openarchivesprotocol.htm#ResponseCompression">
   *  response compression</a> and other protocol features. Supports OAI protocol versions 1.1 and <a
!  *  href="http://www.openarchives.org/OAI/2.0/openarchivesprotocol.htm">2.0</a>. <p>
   *
   *  To perform a harvest, use one of the following methods:
--- 42,50 ----
   *  to file or returning the raw XML as an array of Strings. Supports data providers that use resumption
   *  tokens for <a href="http://www.openarchives.org/OAI/2.0/openarchivesprotocol.htm#FlowControl"> flow
!  *  control</a> , selective harvesting by <a href="http://www.openarchives.org/OAI/2.0/openarchivesprotocol.htm#SelectiveHarvestingandDatestamps">
   *  date</a> or <a href="http://www.openarchives.org/OAI/2.0/openarchivesprotocol.htm#SelectiveHarvestingandSets">
!  *  set</a> , gzip <a href="http://www.openarchives.org/OAI/2.0/openarchivesprotocol.htm#ResponseCompression">
   *  response compression</a> and other protocol features. Supports OAI protocol versions 1.1 and <a
!  *  href="http://www.openarchives.org/OAI/2.0/openarchivesprotocol.htm">2.0</a> . <p>
   *
   *  To perform a harvest, use one of the following methods:
***************
*** 56,60 ****
   *    <br/>
   *    </li>
!  *    <li> The non-static <b>doHarvest</b> method (provides a few additional options): {@link #doHarvest}.<br/>
   *    <br/>
   *    </li>
--- 56,61 ----
   *    <br/>
   *    </li>
!  *    <li> The non-static <b>doHarvest</b> method (provides a few additional options): {@link #doHarvest}.
!  *    <br/>
   *    <br/>
   *    </li>
***************
*** 99,102 ****
--- 100,104 ----
  	private int messagingNum = 100;
  	private long harvestId;
+ 	private int timeOutMilliseconds = 180000;
  
  
***************
*** 233,237 ****
  		try {
  			resmat = harvest(baseURL, metadataPrefix,
! 				set, from, until, outdir, splitBySet, hmh, writeHeaders, harvestAll, harvestAllIfNoDeletedRecord);
  		} catch (Hexception hex) {
  			prtlnErr("Error: " + hex.getMessage());
--- 235,239 ----
  		try {
  			resmat = harvest(baseURL, metadataPrefix,
! 				set, from, until, outdir, splitBySet, hmh, writeHeaders, harvestAll, harvestAllIfNoDeletedRecord, 240000);
  		} catch (Hexception hex) {
  			prtlnErr("Error: " + hex.getMessage());
***************
*** 278,281 ****
--- 280,285 ----
  	 * @param  splitBySet                   True to save each record in separate directories split by set inside
  	 *      outdir, false to save all records to the root of outdir
+ 	 * @param  timeOutMilliseconds          Number of milliseconds the harvester will wait for a response from
+ 	 *      the data provider before timing out
  	 * @return                              If outdir is specified returns null; if outdir is null or "", returns
  	 *      one row for each record harvested. Each row has two elements:
***************
*** 301,314 ****
  	                                 boolean writeHeaders,
  	                                 boolean harvestAll,
! 	                                 boolean harvestAllIfNoDeletedRecord)
  		 throws Hexception, OAIErrorException {
  		Harvester hvst;
  
! 		if (msgHandler == null) {
! 			hvst = new Harvester();
! 		}
! 		else {
! 			hvst = new Harvester(msgHandler);
! 		}
  
  		String[][] res = hvst.doHarvest(baseURL,
--- 305,314 ----
  	                                 boolean writeHeaders,
  	                                 boolean harvestAll,
! 	                                 boolean harvestAllIfNoDeletedRecord,
! 	                                 int timeOutMilliseconds)
  		 throws Hexception, OAIErrorException {
  		Harvester hvst;
  
! 		hvst = new Harvester(msgHandler, timeOutMilliseconds);
  
  		String[][] res = hvst.doHarvest(baseURL,
***************
*** 329,337 ****
  	 *  Creates a Harvester that uses the given HarvestMessageHandler.
  	 *
! 	 * @param  msgHandler  The HarvestMessageHandler that will receive messages as the harvest progresses, or
! 	 *      null if none.
  	 */
! 	public Harvester(HarvestMessageHandler msgHandler) {
  		this.msgHandler = msgHandler;
  		if (msgHandler != null) {
  			messagingNum = msgHandler.getNumRecordsForStatusNotification();
--- 329,339 ----
  	 *  Creates a Harvester that uses the given HarvestMessageHandler.
  	 *
! 	 * @param  msgHandler           The HarvestMessageHandler that will receive messages as the harvest
! 	 *      progresses, or null if none.
! 	 * @param  timeOutMilliseconds  NOT YET DOCUMENTED
  	 */
! 	public Harvester(HarvestMessageHandler msgHandler, int timeOutMilliseconds) {
  		this.msgHandler = msgHandler;
+ 		this.timeOutMilliseconds = timeOutMilliseconds;
  		if (msgHandler != null) {
  			messagingNum = msgHandler.getNumRecordsForStatusNotification();
***************
*** 527,531 ****
  		prtln("outputDir is " + this.outputDir);
  
! 		int z;
  		if (oD.exists())
  			z = Count(oD);
--- 529,533 ----
  		prtln("outputDir is " + this.outputDir);
  
! 		/* int z;
  		if (oD.exists())
  			z = Count(oD);
***************
*** 536,540 ****
  		if ((splitBySet != true) && (recordCount != z)) {
  			recordCount = z;
! 		}
  
  		synchronized (this) {
--- 538,542 ----
  		if ((splitBySet != true) && (recordCount != z)) {
  			recordCount = z;
! 		} */
  
  		synchronized (this) {
***************
*** 712,721 ****
  			}
  
! 			z = Count(oD);
  			prtln("Count at end is " + z);
  			if ((splitBySet != true) && (recordCount != z)) {
  				recordCount = z;
  			}
! 			prtln("recordCount is " + recordCount);
  
  			//Create a zip file of this harvest so that it can be directly downloaded from the UI
--- 714,723 ----
  			}
  
! 			/* z = Count(oD);
  			prtln("Count at end is " + z);
  			if ((splitBySet != true) && (recordCount != z)) {
  				recordCount = z;
  			}
! 			prtln("recordCount is " + recordCount); */
  
  			//Create a zip file of this harvest so that it can be directly downloaded from the UI
***************
*** 744,748 ****
  				ZipFile zipFile = new ZipFile(fullZipFileName);
  
! 				int c = Count(oD);
  
  				zipFile.compress(harvestedToDir.getAbsolutePath());
--- 746,750 ----
  				ZipFile zipFile = new ZipFile(fullZipFileName);
  
! 				
  
  				zipFile.compress(harvestedToDir.getAbsolutePath());
***************
*** 750,757 ****
  
  			endTime = System.currentTimeMillis();
! 
  			if (msgHandler != null) {
  				msgHandler.completedHarvestMessage(
! 					recordCount,
  					resumpCount,
  					baseURL,
--- 752,760 ----
  
  			endTime = System.currentTimeMillis();
! 			//int c = Count(oD);
! 			int c = recordCount;
  			if (msgHandler != null) {
  				msgHandler.completedHarvestMessage(
! 					c,
  					resumpCount,
  					baseURL,
***************
*** 821,824 ****
--- 824,829 ----
  	 */
  	private int Count(File dir) throws Hexception {
+ 		//return 0;
+ 		
  		if (!dir.isDirectory()) {
  			throw new Hexception("File " + dir.getName() + " is not a directory.");
***************
*** 1017,1020 ****
--- 1022,1026 ----
  		// if omitted, use default
  
+ 		// Place the harvested records in an array if no output dir is specified 
  		if (outdir == null) {
  			if (deleted) {
***************
*** 1028,1031 ****
--- 1034,1038 ----
  					ser.serialize(contele);
  					wtr.close();
+ 					recordCount++;
  				} catch (IOException ioe) {
  					throw new Hexception("cannot serialize.  reason: " + ioe);
***************
*** 1033,1037 ****
  				reslist.add(new String[]{
  					encode(identstg), wtr.toString()});
- 				recordCount++;
  				if (recordCount % messagingNum == 0) {
  					if (msgHandler != null) {
--- 1040,1043 ----
***************
*** 1041,1046 ****
--- 1047,1055 ----
  			}
  		}
+ 		
+ 		// Save the harvested records to files if output dir is specified 
  		else {
  			Iterator iter = setlist.iterator();
+ 			boolean savedAtLeastOne = false;
  			while (iter.hasNext()) {
  				String setname = (String) iter.next();
***************
*** 1074,1107 ****
  					}
  					writedoc(fnamebase + ".xml", contele, doc);
! 
! 					recordCount++;
! 
! 					/*
! 					 *  if (recordCount % messagingNum == 0) {
! 					 *  if (msgHandler != null) {
! 					 *  msgHandler.statusMessage(recordCount, resumpCount);
! 					 *  }
! 					 *  }
! 					 */
! 					int c;
! 					File oD = new File(outdir);
! 					if (splitBySet == false) {
! 						c = Count(oD);
! 						if (c % messagingNum == 0) {
! 							if (msgHandler != null) {
! 								msgHandler.statusMessage(c, resumpCount);
! 							}
! 						}
! 					}
! 					else {
! 						if (recordCount % messagingNum == 0) {
! 							if (msgHandler != null) {
! 								msgHandler.statusMessage(recordCount, resumpCount);
! 							}
! 						}
! 					}
! 
  				}
  			}
  		}
  	}
--- 1083,1098 ----
  					}
  					writedoc(fnamebase + ".xml", contele, doc);
! 					savedAtLeastOne = true;
  				}
  			}
+ 			
+ 			if(savedAtLeastOne)
+ 				recordCount++;
+ 			
+ 			if (recordCount % messagingNum == 0) {
+ 				if (msgHandler != null) {
+ 					msgHandler.statusMessage(recordCount, resumpCount);
+ 				}
+ 			}			
  		}
  	}
***************
*** 1162,1166 ****
  		Document doc = null;
  		try {
! 			InputStream istm = TimedURLConnection.getInputStream(request, 180000);
  
  			DocumentBuilderFactory docfactory
--- 1153,1157 ----
  		Document doc = null;
  		try {
! 			InputStream istm = TimedURLConnection.getInputStream(request, timeOutMilliseconds);
  
  			DocumentBuilderFactory docfactory

Index: OAIHarvesterServlet.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/oai/harvester/OAIHarvesterServlet.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** OAIHarvesterServlet.java	8 Sep 2006 06:58:40 -0000	1.16
--- OAIHarvesterServlet.java	13 Jan 2007 01:00:47 -0000	1.17
***************
*** 198,204 ****
  		}
  		
  		ScheduledHarvestManager scheduledHarvestManager = new ScheduledHarvestManager(harvesterSettings,
  					new File(GeneralServletTools.getAbsolutePath("WEB-INF/harvested_records", context)),
! 					harvestLogIndex);
  		
  		// Make context scope objects available::
--- 198,206 ----
  		}
  		
+ 		int harvestTimeOutMilliseconds = Integer.parseInt(context.getInitParameter("harvestTimeOutMilliseconds"));
+ 
  		ScheduledHarvestManager scheduledHarvestManager = new ScheduledHarvestManager(harvesterSettings,
  					new File(GeneralServletTools.getAbsolutePath("WEB-INF/harvested_records", context)),
! 					harvestLogIndex,harvestTimeOutMilliseconds);
  		
  		// Make context scope objects available::

Index: ScheduledHarvestManager.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/oai/harvester/ScheduledHarvestManager.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** ScheduledHarvestManager.java	12 Sep 2006 22:17:53 -0000	1.20
--- ScheduledHarvestManager.java	13 Jan 2007 01:00:47 -0000	1.21
***************
*** 1,1041 ****
! 
! /**
!  *  Copyright 2002, 2003 DLESE Program Center/University Corporation for Atmospheric Research (UCAR), P.O. Box
!  *  3000, Boulder, CO 80307, su...@dl.... This file is part of the DLESE OAI Project. The DLESE OAI
!  *  Project is free software; you can redistribute it and/or modify it under the terms of the GNU General
!  *  Public License as published by the Free Software Foundation; either version 2 of the License, or (at your
!  *  option) any later version. The DLESE OAI Project is distributed in the hope that it will be useful, but
!  *  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
!  *  PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU
!  *  General Public License along with The DLESE System; if not, write to the Free Software Foundation, Inc.,
[...2057 lines suppressed...]
! 	 * @param  s  The String that will be output.
! 	 */
! 	private final void prtln(String s) {
! 		if (debug) {
! 			System.out.println(getDateStamp() + " ScheduledHarvestManager: " + s);
! 		}
! 	}
! 
! 
! 	/**
! 	 *  Sets the debug attribute object
! 	 *
! 	 * @param  db  The new debug value
! 	 */
! 	public static void setDebug(boolean db) {
! 		debug = db;
! 	}
! 
! }
! 

[Dlese-tools-proj] CVS: dlese-tools-project/src/org/dlese/dpc/xml XSLTransformer.java, 1.11, 1.12

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/xml
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv18536/src/org/dlese/dpc/xml

Modified Files:
	XSLTransformer.java 
Log Message:
setSystemId with value for for local xsl file

Index: XSLTransformer.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/xml/XSLTransformer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** XSLTransformer.java	19 Nov 2005 06:25:08 -0000	1.11
--- XSLTransformer.java	12 Jan 2007 20:37:56 -0000	1.12
***************
*** 1,659 ****
! 
! /**
!  *  Copyright 2002, 2003 DLESE Program Center/University Corporation for Atmospheric Research (UCAR), P.O. Box
!  *  3000, Boulder, CO 80307, su...@dl.... This file is part of the DLESE Tools Project. The DLESE Tools
!  *  Project is free software; you can redistribute it and/or modify it under the terms of the GNU General
!  *  Public License as published by the Free Software Foundation; either version 2 of the License, or (at your
!  *  option) any later version. The DLESE Tools Project is distributed in the hope that it will be useful, but
!  *  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
!  *  PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU
!  *  General Public License along with The DLESE System; if not, write to the Free Software Foundation, Inc.,
[...1301 lines suppressed...]
! 	 * @param  s  The String that will be output.
! 	 */
! 	protected final static void prtln(String s) {
! 		if (debug) {
! 			System.out.println(getDateStamp() + " XSLTransformer: " + s);
! 		}
! 	}
! 
! 
! 	/**
! 	 *  Sets the debug attribute of the object
! 	 *
! 	 * @param  db  The new debug value
! 	 */
! 	public static void setDebug(boolean db) {
! 		debug = db;
! 	}
! 
! }
! 

[Dlese-tools-proj] CVS: dlese-tools-project/src/org/dlese/dpc/index/writer ADNFileIndexingWriter.java, 1.69, 1.70

[John W. <jwe...@us...>]

Update of /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/index/writer
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv7473/src/org/dlese/dpc/index/writer

Modified Files:
	ADNFileIndexingWriter.java 
Log Message:
added 3rd level indexing for records cataloged to the 4th level of NSES standards

Index: ADNFileIndexingWriter.java
===================================================================
RCS file: /cvsroot/dlese/dlese-tools-project/src/org/dlese/dpc/index/writer/ADNFileIndexingWriter.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -r1.69 -r1.70
*** ADNFileIndexingWriter.java	31 Aug 2006 00:54:42 -0000	1.69
--- ADNFileIndexingWriter.java	29 Dec 2006 22:28:06 -0000	1.70
***************
*** 1,1510 ****
! /**
!  *  Copyright 2002, 2003 DLESE Program Center/University Corporation for Atmospheric Research (UCAR), P.O. Box
!  *  3000, Boulder, CO 80307, su...@dl.... This file is part of the DLESE Discovery Project. The DLESE
!  *  Discovery Project is free software; you can redistribute it and/or modify it under the terms of the GNU
!  *  General Public License as published by the Free Software Foundation; either version 2 of the License, or
!  *  (at your option) any later version. The DLESE Discovery Project is distributed in the hope that it will be
!  *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
!  *  PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy
!  *  of the GNU General Public License along with The DLESE System; if not, write to the Free Software
!  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
[...3000 lines suppressed...]
! 			return w;
! 		}
! 
! 
! 		/**
! 		 *  DESCRIPTION
! 		 *
! 		 * @return    DESCRIPTION
! 		 */
! 		public String toString() {
! 			String str = "";
! 			try {
! 				str = "North: " + n + " South: " + s + " East: " + e + " West: " + w;
! 			} catch (Throwable t) {}
! 			return str;
! 		}
! 	}
! 
! }
!