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

[Dlese-dds-project] CVS: dds-project/docs/license COPYRIGHT.txt, NONE, 1.1 LICENSE.txt, NONE, 1.1 DLESE_LICENSE.txt, 1.1, NONE

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

Update of /cvsroot/dlese/dds-project/docs/license
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv15095/docs/license

Added Files:
	COPYRIGHT.txt LICENSE.txt 
Removed Files:
	DLESE_LICENSE.txt 
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.

--- DLESE_LICENSE.txt DELETED ---

[Dlese-dds-project] CVS: dds-project/web/services/examples index.jsp, 1.4, 1.5

[Lynne <ly...@us...>]

Update of /cvsroot/dlese/dds-project/web/services/examples
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv3214

Modified Files:
	index.jsp 
Log Message:
Updated link to the sms project

Index: index.jsp
===================================================================
RCS file: /cvsroot/dlese/dds-project/web/services/examples/index.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** index.jsp	15 May 2007 15:59:42 -0000	1.4
--- index.jsp	15 May 2007 16:44:03 -0000	1.5
***************
*** 104,108 ****
  	           <h3><b>Web sites and applications that have integrated DLESE search:</b></h3>
               <ul>
! 		<li><a href="http://www.dlese.org/sms/" target="_blank">Strand Map Service</a> - a visual concept space browser for Earth system education concepts
  		that links Earth system concepts to educational resources found in DLESE.		</li><li><a href="http://geonnode.cs.colorado.edu:8080/geonedu/index.jsp" target="_blank">Earth System Event Browser</a> - an Earth system event browser
  		that links Earth system related events in the news such as hurricanes and earthquakes to educational resources found in DLESE.
--- 104,108 ----
  	           <h3><b>Web sites and applications that have integrated DLESE search:</b></h3>
               <ul>
! 		<li><a href="http://www.dlese.org/cmb/" target="_blank">Strand Map Service</a> - a visual concept space browser for Earth system education concepts
  		that links Earth system concepts to educational resources found in DLESE.		</li><li><a href="http://geonnode.cs.colorado.edu:8080/geonedu/index.jsp" target="_blank">Earth System Event Browser</a> - an Earth system event browser
  		that links Earth system related events in the news such as hurricanes and earthquakes to educational resources found in DLESE.

[Dlese-dds-project] CVS: dds-project/web/services/examples index.jsp, 1.3, 1.4

[Lynne <ly...@us...>]

Update of /cvsroot/dlese/dds-project/web/services/examples
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv19726

Modified Files:
	index.jsp 
Log Message:
commented out link which was going to a wrong site.

Index: index.jsp
===================================================================
RCS file: /cvsroot/dlese/dds-project/web/services/examples/index.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** index.jsp	8 Aug 2006 22:42:05 -0000	1.3
--- index.jsp	15 May 2007 15:59:42 -0000	1.4
***************
*** 63,67 ****
  		</li>
  		<li><a href="http://www.coseeflorida.org/index.php?option=com_wrapper&amp;Itemid=109" target="_blank">Florida COSEE (FCOSEE)</a> - The Florida Center for Ocean Sciences Education Excellence Web site
! 			(<a href="http://floridacosee.net/index.php?option=com_content&amp;task=view&amp;id=37&amp;Itemid=93" target="_blank">linked from here</a>).	
  			See also the <a href="http://search.dlese.org/fcosee/">demo prepared for Florida COSEE</a>.		</li>
  		<li><a href="http://www.dlisr.org/" target="_blank">DLISR</a> - The Digital Library of Indigenous Science Resources. 
--- 63,67 ----
  		</li>
  		<li><a href="http://www.coseeflorida.org/index.php?option=com_wrapper&amp;Itemid=109" target="_blank">Florida COSEE (FCOSEE)</a> - The Florida Center for Ocean Sciences Education Excellence Web site
! 			<!-- (<a href="http://floridacosee.net/index.php?option=com_content&amp;task=view&amp;id=37&amp;Itemid=93" target="_blank">linked from here</a>)-->.	
  			See also the <a href="http://search.dlese.org/fcosee/">demo prepared for Florida COSEE</a>.		</li>
  		<li><a href="http://www.dlisr.org/" target="_blank">DLISR</a> - The Digital Library of Indigenous Science Resources. 

[Dlese-dds-project] CVS: dds-project/docs CHANGES.txt,1.99,1.100

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

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

Modified Files:
	CHANGES.txt 
Log Message:
updated for release

Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/dlese/dds-project/docs/CHANGES.txt,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -r1.99 -r1.100
*** CHANGES.txt	27 Apr 2007 14:54:05 -0000	1.99
--- CHANGES.txt	4 May 2007 23:48:23 -0000	1.100
***************
*** 11,15 ****
  
  
! Changes in v3.3.8 
  
  -Files are now explicitly read into the index using UTF-8 encoding instead of the 
--- 11,15 ----
  
  
! Changes in v3.3.8 (released May 4, 2007)
  
  -Files are now explicitly read into the index using UTF-8 encoding instead of the 

[Dlese-dds-project] CVS: dds-project/docs dds-documentation.html, 1.8, 1.9 dlese_architecture_overview.gif, 1.2, 1.3 dlese_architecture_overview.html, 1.2, 1.3 dlese_architecture_overview.ppt, 1.2, 1.3 javascript_search_service.html, 1.2, 1.3 search_web_services.html, 1.3, 1.4 software-development-process.html, 1.8, 1.9

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

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

Modified Files:
	dds-documentation.html dlese_architecture_overview.gif 
	dlese_architecture_overview.html 
	dlese_architecture_overview.ppt javascript_search_service.html 
	search_web_services.html software-development-process.html 
Log Message:
updated documentation for library v2.5

Index: dds-documentation.html
===================================================================
RCS file: /cvsroot/dlese/dds-project/docs/dds-documentation.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** dds-documentation.html	12 Oct 2006 23:32:19 -0000	1.8
--- dds-documentation.html	4 May 2007 23:36:15 -0000	1.9
***************
*** 10,19 ****
  <h1> Documentation for the DLESE 
      Discovery System (DDS)</h1>
! <h2> Version 3.3.5</h2>
! <p>DDS v3.3.5 is part of DLESE v2.4<br>
  <a href="http://dlese.cvs.sourceforge.net/dlese/dds-project/docs/CHANGES.txt?view=markup">Changes since last release</a></p>
  <h2> Description </h2> 
  <p>The <a href="http://www.dlese.org/dds/index.jsp">DLESE Discovery System</a> (DDS) provides search and discovery services for items in the library including educational resources, resource annotations, news and opportunity postings, collection metadata, and other metadata types. These discovery services are available in two ways: First through the main library interface at <a href="http://www.dlese.org/">www.dlese.org</a>, which is accessed by library visitors who perform searches using their web browser. Second, through DLESE's <a href="search_web_services.html">search web service</a>, which provides programmatic access to DLESE's metadata and search functionality for distributed access by developers. The DDS is designed to support  rapid search and retrieval for items in the library using natural language, boolean, vocabulary field, date range and geospatial bounding box queries. The system uses an inverse index and Information Retrieval techniques implemented using  <a href="http://lucene.apache.org/" target="_blank">Lucene</a>. The DDS also includes a set of administrative functions to aid in managing and monitoring the collections through a web interface accessible to library administrators. </p>
! <p>The DDS software is built upon a <a href="http://java.sun.com/blueprints/guidelines/designing_enterprise_applications_2e/web-tier/web-tier5.html">Model-View-Controller</a> 
    (MVC) architecture that is implemented using the <a href="http://struts.apache.org/">Struts 
      application framework</a>. In this MVC architecture, the major parts of 
--- 10,19 ----
  <h1> Documentation for the DLESE 
      Discovery System (DDS)</h1>
! <h2> Version 3.3.8</h2>
! <p>
  <a href="http://dlese.cvs.sourceforge.net/dlese/dds-project/docs/CHANGES.txt?view=markup">Changes since last release</a></p>
  <h2> Description </h2> 
  <p>The <a href="http://www.dlese.org/dds/index.jsp">DLESE Discovery System</a> (DDS) provides search and discovery services for items in the library including educational resources, resource annotations, news and opportunity postings, collection metadata, and other metadata types. These discovery services are available in two ways: First through the main library interface at <a href="http://www.dlese.org/">www.dlese.org</a>, which is accessed by library visitors who perform searches using their web browser. Second, through DLESE's <a href="search_web_services.html">search web service</a>, which provides programmatic access to DLESE's metadata and search functionality for distributed access by developers. The DDS is designed to support  rapid search and retrieval for items in the library using natural language, boolean, vocabulary field, date range and geospatial bounding box queries. The system uses an inverse index and Information Retrieval techniques implemented using  <a href="http://lucene.apache.org/" target="_blank">Lucene</a>. The DDS also includes a set of administrative functions to aid in managing and monitoring the collections through a web interface accessible to library administrators. </p>
! <p>The DDS software is built upon a Model-View-Controller 
    (MVC) architecture that is implemented using the <a href="http://struts.apache.org/">Struts 
      application framework</a>. In this MVC architecture, the major parts of 
***************
*** 200,206 ****
  <p>[1] Designing Enterprise Applications with the J2EETM Platform, Second Edition. 
    Inderjeet Singh, Beth Stearns, Mark Johnson, and the Enterprise Team. <a href="http://java.sun.com/blueprints/guidelines/designing_enterprise_applications_2e/titlepage.html">http://java.sun.com/blueprints/guidelines/designing_enterprise_applications_2e/titlepage.html</a>.</p>
! <p>
! <i>Contact: <a href="mailto:su...@dl...">su...@dl...</a></i><br>
!   <i>Last updated: Oct 12, 2006</i><br>
    <i>Author: John Weatherley</i><br>
  </p>
--- 200,205 ----
  <p>[1] Designing Enterprise Applications with the J2EETM Platform, Second Edition. 
    Inderjeet Singh, Beth Stearns, Mark Johnson, and the Enterprise Team. <a href="http://java.sun.com/blueprints/guidelines/designing_enterprise_applications_2e/titlepage.html">http://java.sun.com/blueprints/guidelines/designing_enterprise_applications_2e/titlepage.html</a>.</p>
! <p><br>
!   <i>Last updated: May 2007</i><br>
    <i>Author: John Weatherley</i><br>
  </p>

Index: dlese_architecture_overview.gif
===================================================================
RCS file: /cvsroot/dlese/dds-project/docs/dlese_architecture_overview.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
Binary files /tmp/cvs8SRwFJ and /tmp/cvsrVu9qy differ

Index: dlese_architecture_overview.html
===================================================================
RCS file: /cvsroot/dlese/dds-project/docs/dlese_architecture_overview.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** dlese_architecture_overview.html	24 Jun 2006 00:59:40 -0000	1.2
--- dlese_architecture_overview.html	4 May 2007 23:36:15 -0000	1.3
***************
*** 1,281 ****
! <html>
! <head>
! <title>DLESE Architecture Overview</title>
! 	<link rel="stylesheet" type="text/css" href="/dlese_shared/dlese_styles.css" />
! 	<link rel="stylesheet" type="text/css" href="/libdev/docs/docs_styles.css" />
! </head>
! <body>
! <h1> DLESE 
!     Architecture Overview </h1>
! <h2> Version 2.4</h2>
! <p>This architecture describes  the DLESE library v2.4 architecture </p>
! <h2> Description </h2> 
! <p>This page provides a summary of the overall architecture of the DLESE  library v2.4, released in June 2006. Each of the major components of the library is described in brief and links are provided that lead to more detailed information. The diagram here shows the flow of library resources  from record import, quality assurance, indexing to search and the numbered items, corresponding to the major components of the library, are described and summarized below. <br>
! </p>
! <p><img src="dlese_architecture_overview.gif" width="824" height="656"> </p>
! <h3>1. Collection accessioning </h3>
! <ul>
!   <li>Collections are accessioned into the library, following the collection accessioning process. A collection-level metadata editor is used  to create new collection-level metadata records and edit existing records. This is currently done using XML Spy, and will eventually be managed  using the DLESE Collection System (DCS) tool (see below).
!       <ul>
!         <li>Collection builders submit collection information via a simple web form at http://www.dlese.org. </li>
!         <li>Data are reviewed for accuracy and policy adherence and then DPC staff create/edit collection-level metadata in the XML editor. </li>
!         <li>Collection-level metadata is immediately available to the Collection Manager, and the collection begins the QA process. Records for the collection are ingested into a preaccession portion of the library for inspection by library QA staff and collection builders only and not yet made publically available.</li>
!         <li>Once a collection is approved, its metadata is brought to the library and enabled using the Collection Manager to become publically available to users and the search APIs. </li>
!       </ul>
!   </li>
!   <li>Assumptions and policies
!       <ul>
!         <li>Inclusion of collection is authorized by Collection Approval Committee. </li>
!       </ul>
!   </li>
! </ul>
! <h3>2. DCS used for internal collection building and QA</h3>
! <ul>
!   <li>The <a href="../v2.0/DCS_1-1.html">DLESE Collection System</a> (DCS)  is used  to create new library records and perform QA over the existing library catalog. Specific collections that are managed using the DCS include the DLESE Community Collection (DCC), the DWEL collection, community news and opportunities postings, and various annotation collections.
!     <ul>
!       <li>Allows creating and editing of individual records. </li>
!         <li>Provides search and discovery tools to support certain QA tasks over the collection.</li>
!         <li>QA administrator can include/exclude records from discovery in the library by changing their status via the DCS UI.
!             <ul>
!               <li>Only records with the proper status get exported to the metadata store (#5)</li>
!             </ul>
!         </li>
!     </ul>
!   </li>
!   <li>Assumptions and policies
!       <ul>
!         <li>All resources will have a URL at this time. Off-line resources are not yet supported. DLESE Scope statement indicates that on-line resources are favored for the collection. </li>
!       </ul>
!   </li>
! </ul>
! 
! <h3>3. OAI harvester - Import external collections and annotation metadata</h3>
! <ul>
!   <li>Records from external collection builders are imported in XML format using the Open Archives Initiative Protocol for Metadata Harvesting (OAI-PMH) as well as other means such as e-mail and ftp. External collection builders may or may not be using an instance of the DCS to catalog. </li>
!   <li>Configuration is handled by DPC staff in the <a href="oai-documentation.html">DLESE OAI harvester</a> application's administration UI.
!       <ul>
!         <li>Configuration options  include: name of harvested collection, OAI BASE_URL and set (optional) of the collection, location where files will be stored after harvesting, harvest interval. </li>
!       </ul>
!   </li>
!   <li>External collections are currently being harvested via OAI in ADN format (DWEL, AVC, SERC collections, COMET, NASA, others) and annotation format (CRS).</li>
!   <li>Assumptions and policies
!       <ul>
!         <li>Collection builder has performed a preliminary check for record validity. Collection builders who have installed the DLESE OAI software v2.0 or greater will be able to use the software to perform this basic validation prior to serving. </li>
!       </ul>
!   </li>
! </ul>
! 
! <h3>4. Normalize and validate data</h3>
! 
! <p>Prior to arriving in the Metadata store (#5), records are normalized, validated and checked for integrity. This pre-processing step includes transformation of records to ADN from  other formats, additional metadata clean-up, schema validation, checking for improper characters in XML, and generation of appropriate annotation metadata.
!   
! </p>
! <ul>
!   <li>Records that arrive in non-ADN format are transformed and normalized to ADN after they are harvested and stored to a global metadata store (#5) that is accessible to other processes. </li>
!   <li>Records that arrive in ADN format are stored directly in the global metadata store (#5) after passing schema validation and other integrity checks.
!     <ul>
!         <li>ADN records are also checked for duplicate fields (not caught by schema validation) and cleaned up if necessary. </li>
!       </ul>
!   </li>
!   <li>Report is generated listing files that could not be transformed or validated and the reason for the error.
!       <ul>
!         <li>Check for parsing character encoding errors.</li>
!         <li>Check for validation errors in both input and output XML. </li>
!         <li>Clean up metadata if necessary (delete duplicate vocab entries, etc.)</li>
!         <li>Resource availability is checked using the IDMapper service. </li>
!         <li>Report is available for viewing or for use in other processes. </li>
!       </ul>
!   </li>
!   <li>Assumptions and policies
!       <ul>
!         <li>DPC staff  inform and provide support to collection builders whose records have failed to transform or validate successfully.</li>
!       </ul>
!   </li>
! </ul>
! 
! <h3>5. Metadata store</h3>
! <p>The XML metadata store holds the metadata for all items in the library.</p>
! <ul><li>Formats include:
!       <ul>
!         <li>ADN</li>
!         <li>Collection metadata </li>
!         <li>News and Opportunities </li>
!         <li>Annotation metadata</li>
!         <li>Others as needed </li>
!       </ul>
!   </li>
!   <li>Collection records are saved to the data store via the Collection-level metadata editor (#1) </li>
!   <li>Assumptions and policies
!       <ul>
!         <li>All data has been normalized, validated and has passed basic integrity checks. </li>
!       </ul>
!   </li>
! </ul>
! 
! <h3>6. Resource centered data </h3>
! <p>Prior to and during the indexing process, records are grouped based on a resouce-centric model. This is done by identifying all collections, records, annotations, content in the resource, and content standards that relate to a given resource. This relationship data is then used by the index to create a single index entry for each resource that combines and exposes all these into one searchable item.</p>
! <ul>
!   <li>The Resource-to-ID mapper service is used in this step to perform these primary functions:
!       <ul>
!         <li>Identify records within a single collection that have the same primary URL, which is a quality error.
!           <ul>
!               <li>Provides policy enforcement over external collections. </li>
!           </ul>
!         </li>
!         <li>Map each unique resource  to all records that exist for the resource across collections.
!             <ul>
!               <li>Report of URLs and associated IDs available to other processes, such as index. </li>
!             </ul>
!         </li>
!         <li>Link checker verifies URLs within each record for correctness and HTTP errors.
!             <ul>
!               <li>Report on link problems generated detailing bad links over time and e-mailed to DPC staff. </li>
!               <li>Report available to other processes, such as the DDS. </li>
!             </ul>
!         </li>
!         <li>Store the content of the resource so it may be accessed by the index.</li>
!       </ul>
!   </li>
!   <li>The basic task:
!       <ul>
!         <li>Associate all records that seem to describe the same resource. This task involves:
!           <ul>
!               <li>Checking the similarity of the URLs themselves </li>
!               <li>Hashing algorithm is used for content similarity checks</li>
!           </ul>
!         </li>
!       </ul>
!   </li>
!   <li>Assumptions and Policies
!   </li>
!   <ul>
!     <ul>
!       <li>Duplicate URL's within a collection are not allowed and will not be accessioned. No formal policy for external collections states this, but this had been the policy for DLESE Broad thus far.</li>
!     </ul>
!   </ul>
! </ul>
! 
! <h3>7. Search index</h3>
! 
! <ul>
!   <li>An  index of library records is generated on a nightly basis.
!     <ul>
!       <li> The index and searching components of the library are built using <a href="http://lucene.apache.org/">Lucene</a>.    
!       </li>
!     </ul>
!   </li>
!   <ul>
!     <li>A resource-centric index is  generated from the metadata store, the content of the resources and from information about the relationships among the records that identified in step 6.
!       <ul>
!             <li>Index contains entries for the educational resources, news and opportunities, annotations, collections, and other records associated with the library.</li>
!       </ul>
!     </li>
!       <li>Searches performed over the index  use  a rich Information Retrieval search query language referred to here as the DLESE Query Language (DQL).
!         <ul>
!           <li> This query language is the result of the standard Lucene query   language operating over the specific DLESE fields created in the index.</li>
!         </ul>
!       </li>
!       <li>When searched, the index  returns a list of results ordered by rank. Rank may be controlled by the searcher by applying weights to individual fields. For example if the search term exists in the title of the record this may be assigned more weight than if the term exists only in the description field. The public Search APIs implement a default boosting to provide higher weight for users searches that match terms in the title and description fields of the resources over other parts of the indexed text. </li>
!   </ul>
!   <li>Assumptions and policies
!       <ul>
!         <li>Date and accession information in an item level record is not used or amended by DLESE. Accessioning dates and status as they pertain to DLESE are maintained in a separate database maintained by the DPC. </li>
!       </ul>
!   </li>
! </ul>
! 
! <h3>8. Collection manager</h3>
! 
! <ul>
!   <li>A collection management system provides an interface for DPC staff to inspect the collections and perform basic administrative functions, such as:
!     <ul>
!       <li>Enable or disable collections from being discoverable in the DDS and search web service. </li>
!         <li>Issue unlimited search queries over the collection(s).
!           <ul>
!             <li>Search  and inspect errors that were found in the resources during steps #4 and #6.</li>
!             <li>Search and display those resources that have duplicate records.</li>
!             <li>Search and display resources that have been annotated.</li>
!           </ul>
!         </li>
!         <li>Perform a visual spot check and QA of a collection&rsquo;s item level metadata. </li>
!     </ul>
!   </li>
!   <li>Assumptions and policies
!       <ul>
!         <li>A collection-level record exists for each discoverable collection. </li>
!       </ul>
!   </li>
! </ul>
! 
! <h3>9. Search APIs</h3>
! <p>The library repository search is exposed through two  public APIs: The <a href="search_web_services.html">DLESE Search Web Service</a> and the the <a href="javascript_search_service.html">JavaScript search service</a>. These APIs are used to create user interfaces and other view applications  to access the library, and to conduct research related to the content in the library. </p>
! <ul>
!         <li>The records returned via these services are ordered with the most relevant resources at the top. Relevancy is weighed so that resources that contain the search terms in their title, are cataloged multiple times, meet a higher review standard or contain matching terms in their description are given the highest rank.</li>
!         <li>Clients that use the service APIs can control what is searched and returned and can set custom parameters for the relevancy ranking of the search results. </li>
!         <li>Results are returned one resource per entry, which may contain metadata from multiple resources, collections and annotations.
!           <ul>
!               <li>If multiple records exist for a resource, these are combined and returned in a response entry for the resources </li>
!               <li>Of the duplicates, the  record with the highest rank based on the user's query will be the one displayed in the brief description.</li>
!           </ul>
!   </li>
! </ul>
!   <ul>
!     <li>The <a href="search_web_services.html">DLESE Search Web Service</a> (DDSWS) provides a REST Web service interface to DLESE's metadata and search functionality.
!         <ul>
!           <li>The service is used by internal and external developers to provide search interfaces to the library. </li>
!           <li>Developers may use the service to create a variety of custom search interfaces, access the data in the DLESE repository, or conduct research about the library repository and it's contents</li>
!         </ul>
!     </li>
!     <li>The <a href="javascript_search_service.html">JavaScript search service</a> provides a JavaScript interface to DLESE's search functionality. This service and framework allows DLESE search to be inserted into a web page using simply HTML, JavaScript and CSS, making custom DLESE search widely accessible for use by web page developers. Use cases for the service include educational design, custom search pages for targeted audiences and other applications where the dynamic content of the library may be useful. </li>
!   </ul>
!   <li>Assumptions and policies
!       <ul>
!         <li>Extra weight will be applied to reviewed items when ranking, if possible. There is no policy to support this at this time. </li>
!         <li>Only one entry will be displayed for resources that have multiple records from separate collections associated with it. </li>
!         <li>Branding information identifying the contributing collection will be visible with each record returned. </li>
!         <li>Annotation information will be linked from results. </li>
!         <li>In keeping with DLESE privacy policy, contact information for record creators will not be displayed in service responses. </li>
!       </ul>
!   </li>
!   <h3>12. DSV - Library search and browse interface </h3>
!   <p>Users who visit the library at www.dlese.org interact with the DLESE Search View (DSV) application. The DSV is a client application built using the DLESE Search Web Service and provides the primary  user interface for searching and browsing the resources, collections, and annotations in the library.</p>
!   <h3>12. Search clients</h3>
! <ul>
!   <li>In addition to the DSV, a variety of additional search clients are built using  DLESE's <a href="search_web_services.html">Search Web Service</a> and <a href="javascript_search_service.html">JavaScript Search Service</a> to provide custom, contextualized user interfaces   over the library collections, or are used for data analysis or research purposes. Clients that access the search web service are implemented using application software such as Tomcat / JSP, PHP, Java or other environments that are able to communicate using  web service protocols and parse  XML data for display or data analysis purposes. Clients that access the JavaScript service are implemented  using HTML, JavaScript and CSS and are available for access using standard web browsers.
! Some example clients:  
!     <ul>
!       <li>The <a href="http://www.globe.gov/tctg/tgchapter.jsp?sectionId=1">GLOBE project</a> uses the search web service to provide access to DLESE resources from within the Teacher's Guide portion of their site. </li>
!       <li>The <a href="http://cosee.net">Center for Ocean Science Education Excellence</a> (COSEE) uses the search web service to provide a custom search interface for their web site visitors. </li>
!       <li>The <a href="news-opps.html">news and opportunities</a> portion of the DLESE web site uses the search web service to provide a search interface for community-related news and opportunities.</li>
!       <li>The <a href="cas.html">Creator Acknowledgement System</a> (CAS) provides a search interface that uses the search web service to display resources in the library that are attributed to an individual or institution. The CAS also uses the web service internally to determine which resources are new to the library and who needs to be e-mailed to notify them that their resources have been included in the library. </li>
!       <li>Several other clients have been built that use the service such as the Strand Map Service, the Idea Keeper, and a number of additional search pages for DLESE partners. </li>
!     </ul>
!   </li>
! </ul>
! <h3>13. OAI data provider - Export via Open Archives Initiative Protocol for Metadata Harvesting (OAI-PMH)</h3>
! 
! <ul>
!   <li>External partners wishing to gain full access to the DLESE data store may harvest records using the OAI-PMH in all available DLESE formats. </li>
!   <li>Dublin Core format made available for export to external OAI-complient repositories. The qualified NSDL Dublin Core format is made available for the NSDL. </li>
!   <li>Assumptions and policies
!       <ul>
!         <li>Records from external collections will only be made available for those collections who wish DLESE to proxy their data. </li>
!         <li>IP and privacy policies for each collection apply to harvested metadata.
!             <ul>
!               <li>In keeping with DLESE privacy policy, contact information for record creators will not distributed. </li>
!             </ul>
!         </li>
!         <li>Will all items in data store be harvestable via OAI or only those discoverable in DLESE .. Policy decision needed here.</li>
!       </ul>
!   </li>
! </ul>
! <p>
! <i>Contact: <a href="mailto:su...@dl...">su...@dl...</a></i><br>
!   <i>Last updated: June 23, 2006</i><br>
!   <i>Author: John Weatherley</i><br>
! </p>
! </body>
! </html>
! 
! 
! 
--- 1,280 ----
! <html>
! <head>
! <title>DLESE Architecture Overview</title>
! 	<link rel="stylesheet" type="text/css" href="/dlese_shared/dlese_styles.css" />
! 	<link rel="stylesheet" type="text/css" href="/libdev/docs/docs_styles.css" />
! </head>
! <body>
! <h1> DLESE 
!     Architecture Overview </h1>
! <h2> Version 2.5</h2>
! <p>This architecture describes  the DLESE library v2.5 architecture </p>
! <h2> Description </h2> 
! <p>This page provides a summary of the overall architecture of the DLESE  library v2.5, released in May 2007. Each of the major components of the library is described in brief and links are provided that lead to more detailed information. The diagram here shows the flow of library resources  from record import, quality assurance, indexing to search and the numbered items, corresponding to the major components of the library, are described and summarized below. <br>
! </p>
! <p><img src="dlese_architecture_overview.gif" width="795" height="650"> </p>
! <h3>1. Collection accessioning </h3>
! <ul>
!   <li>Collections are accessioned into the library, following the collection accessioning process. A collection-level metadata editor is used  to create new collection-level metadata records and edit existing records. This is currently done using XML Spy, and will eventually be managed  using the DLESE Collection System (DCS) tool (see below).
!       <ul>
!         <li>Collection builders submit collection information via a simple web form at http://www.dlese.org. </li>
!         <li>Data are reviewed for accuracy and policy adherence and then DPC staff create/edit collection-level metadata in the XML editor. </li>
!         <li>Collection-level metadata is immediately available to the Collection Manager, and the collection begins the QA process. Records for the collection are ingested into a preaccession portion of the library for inspection by library QA staff and collection builders only and not yet made publically available.</li>
!         <li>Once a collection is approved, its metadata is brought to the library and enabled using the Collection Manager to become publically available to users and the search APIs. </li>
!       </ul>
!   </li>
!   <li>Assumptions and policies
!       <ul>
!         <li>Inclusion of collection is authorized by Collection Approval Committee. </li>
!       </ul>
!   </li>
! </ul>
! <h3>2. DCS used for internal collection building and QA</h3>
! <ul>
!   <li>The DLESE Collection System (DCS)  is used  to create new library records and perform QA over the existing library catalog. Specific collections that are managed using the DCS include the DLESE Community Collection (DCC), the DWEL collection, community news and opportunities postings, and various annotation collections.
!     <ul>
!       <li>Allows creating and editing of individual records. </li>
!         <li>Provides search and discovery tools to support certain QA tasks over the collection.</li>
!         <li>QA administrator can include/exclude records from discovery in the library by changing their status via the DCS UI.
!             <ul>
!               <li>Only records with the proper status get exported to the metadata store (#5)</li>
!             </ul>
!         </li>
!     </ul>
!   </li>
!   <li>Assumptions and policies
!       <ul>
!         <li>All resources will have a URL at this time. Off-line resources are not yet supported. DLESE Scope statement indicates that on-line resources are favored for the collection. </li>
!       </ul>
!   </li>
! </ul>
! 
! <h3>3. OAI harvester - Import external collections and annotation metadata</h3>
! <ul>
!   <li>Records from external collection builders are imported in XML format using the Open Archives Initiative Protocol for Metadata Harvesting (OAI-PMH) as well as other means such as e-mail and ftp. External collection builders may or may not be using an instance of the DCS to catalog. </li>
!   <li>Configuration is handled by DPC staff in the <a href="oai-documentation.html">DLESE OAI harvester</a> application's administration UI.
!       <ul>
!         <li>Configuration options  include: name of harvested collection, OAI BASE_URL and set (optional) of the collection, location where files will be stored after harvesting, harvest interval. </li>
!       </ul>
!   </li>
!   <li>External collections are currently being harvested via OAI in ADN format (DWEL, AVC, SERC collections, COMET, NASA, others) and annotation format (CRS).</li>
!   <li>Assumptions and policies
!       <ul>
!         <li>Collection builder has performed a preliminary check for record validity. Collection builders who have installed the DLESE OAI software v2.0 or greater will be able to use the software to perform this basic validation prior to serving. </li>
!       </ul>
!   </li>
! </ul>
! 
! <h3>4. Normalize and validate data</h3>
! 
! <p>Prior to arriving in the Metadata store (#5), records are normalized, validated and checked for integrity. This pre-processing step includes transformation of records to ADN from  other formats, additional metadata clean-up, schema validation, checking for improper characters in XML, and generation of appropriate annotation metadata.
!   
! </p>
! <ul>
!   <li>Records that arrive in non-ADN format are transformed and normalized to ADN after they are harvested and stored to a global metadata store (#5) that is accessible to other processes. </li>
!   <li>Records that arrive in ADN format are stored directly in the global metadata store (#5) after passing schema validation and other integrity checks.
!     <ul>
!         <li>ADN records are also checked for duplicate fields (not caught by schema validation) and cleaned up if necessary. </li>
!     </ul>
!   </li>
!   <li>Report is generated listing files that could not be transformed or validated and the reason for the error.
!       <ul>
!         <li>Check for parsing character encoding errors.</li>
!         <li>Check for validation errors in both input and output XML. </li>
!         <li>Clean up metadata if necessary (delete duplicate vocab entries, etc.)</li>
!         <li>Resource availability is checked using the IDMapper service. </li>
!         <li>Report is available for viewing or for use in other processes. </li>
!       </ul>
!   </li>
!   <li>Assumptions and policies
!       <ul>
!         <li>DPC staff  inform and provide support to collection builders whose records have failed to transform or validate successfully.</li>
!       </ul>
!   </li>
! </ul>
! 
! <h3>5. Metadata store</h3>
! <p>The XML metadata store holds the metadata for all items in the library.</p>
! <ul><li>Formats include:
!       <ul>
!         <li>ADN</li>
!         <li>Collection metadata </li>
!         <li>News and Opportunities </li>
!         <li>Annotation metadata</li>
!         <li>Others as needed </li>
!       </ul>
!   </li>
!   <li>Collection records are saved to the data store via the Collection-level metadata editor (#1) </li>
!   <li>Assumptions and policies
!       <ul>
!         <li>All data has been normalized, validated and has passed basic integrity checks. </li>
!       </ul>
!   </li>
! </ul>
! 
! <h3>6. Resource centered data </h3>
! <p>Prior to and during the indexing process, records are grouped based on a resouce-centric model. This is done by identifying all collections, records, annotations, content in the resource, and content standards that relate to a given resource. This relationship data is then used by the index to create a single index entry for each resource that combines and exposes all these into one searchable item.</p>
! <ul>
!   <li>The Resource-to-ID mapper service is used in this step to perform these primary functions:
!       <ul>
!         <li>Identify records within a single collection that have the same primary URL, which is a quality error.
!           <ul>
!               <li>Provides policy enforcement over external collections. </li>
!           </ul>
!         </li>
!         <li>Map each unique resource  to all records that exist for the resource across collections.
!             <ul>
!               <li>Report of URLs and associated IDs available to other processes, such as index. </li>
!             </ul>
!         </li>
!         <li>Link checker verifies URLs within each record for correctness and HTTP errors.
!             <ul>
!               <li>Report on link problems generated detailing bad links over time and e-mailed to DPC staff. </li>
!               <li>Report available to other processes, such as the DDS. </li>
!             </ul>
!         </li>
!         <li>Store the content of the resource so it may be accessed by the index.</li>
!       </ul>
!   </li>
!   <li>The basic task:
!       <ul>
!         <li>Associate all records that seem to describe the same resource. This task involves:
!           <ul>
!               <li>Checking the similarity of the URLs themselves </li>
!               <li>Hashing algorithm is used for content similarity checks</li>
!           </ul>
!         </li>
!       </ul>
!   </li>
!   <li>Assumptions and Policies
!   </li>
!   <ul>
!     <ul>
!       <li>Duplicate URL's within a collection are not allowed and will not be accessioned. No formal policy for external collections states this, but this had been the policy for DLESE Broad thus far.</li>
!     </ul>
!   </ul>
! </ul>
! 
! <h3>7. Search index</h3>
! 
! <ul>
!   <li>An  index of library records is generated on a nightly basis.
!     <ul>
!       <li> The index and searching components of the library are built using <a href="http://lucene.apache.org/">Lucene</a>.    
!       </li>
!     </ul>
!   </li>
!   <ul>
!     <li>A resource-centric index is  generated from the metadata store, the content of the resources and from information about the relationships among the records that identified in step 6.
!       <ul>
!             <li>Index contains entries for the educational resources, news and opportunities, annotations, collections, and other records associated with the library.</li>
!       </ul>
!     </li>
!       <li>Searches performed over the index  use  a rich Information Retrieval search query language referred to here as the DLESE Query Language (DQL).
!         <ul>
!           <li> This query language is the result of the standard Lucene query   language operating over the specific DLESE fields created in the index.</li>
!         </ul>
!       </li>
!       <li>When searched, the index  returns a list of results ordered by rank. Rank may be controlled by the searcher by applying weights to individual fields. For example if the search term exists in the title of the record this may be assigned more weight than if the term exists only in the description field. The public Search APIs implement a default boosting to provide higher weight for users searches that match terms in the title and description fields of the resources over other parts of the indexed text. </li>
!   </ul>
!   <li>Assumptions and policies
!       <ul>
!         <li>Date and accession information in an item level record is not used or amended by DLESE. Accessioning dates and status as they pertain to DLESE are maintained in a separate database maintained by the DPC. </li>
!       </ul>
!   </li>
! </ul>
! 
! <h3>8. Collection manager</h3>
! 
! <ul>
!   <li>A collection management system provides an interface for DPC staff to inspect the collections and perform basic administrative functions, such as:
!     <ul>
!       <li>Enable or disable collections from being discoverable in the DDS and search web service. </li>
!         <li>Issue unlimited search queries over the collection(s).
!           <ul>
!             <li>Search  and inspect errors that were found in the resources during steps #4 and #6.</li>
!             <li>Search and display those resources that have duplicate records.</li>
!             <li>Search and display resources that have been annotated.</li>
!           </ul>
!         </li>
!         <li>Perform a visual spot check and QA of a collection&rsquo;s item level metadata. </li>
!     </ul>
!   </li>
!   <li>Assumptions and policies
!       <ul>
!         <li>A collection-level record exists for each discoverable collection. </li>
!       </ul>
!   </li>
! </ul>
! 
! <h3>9. Search APIs</h3>
! <p>The library repository search is exposed through two  public APIs: The <a href="search_web_services.html">DLESE Search Web Service</a> and the the <a href="javascript_search_service.html">JavaScript search service</a>. These APIs are used to create user interfaces and other view applications  to access the library, and to conduct research related to the content in the library. </p>
! <ul>
!         <li>The records returned via these services are ordered with the most relevant resources at the top. Relevancy is weighed so that resources that contain the search terms in their title, are cataloged multiple times, meet a higher review standard or contain matching terms in their description are given the highest rank.</li>
!         <li>Clients that use the service APIs can control what is searched and returned and can set custom parameters for the relevancy ranking of the search results. </li>
!         <li>Results are returned one resource per entry, which may contain metadata from multiple resources, collections and annotations.
!           <ul>
!               <li>If multiple records exist for a resource, these are combined and returned in a response entry for the resources </li>
!               <li>Of the duplicates, the  record with the highest rank based on the user's query will be the one displayed in the brief description.</li>
!           </ul>
!   </li>
! </ul>
!   <ul>
!     <li>The <a href="search_web_services.html">DLESE Search Web Service</a> (DDSWS) provides a REST Web service interface to DLESE's metadata and search functionality.
!         <ul>
!           <li>The service is used by internal and external developers to provide search interfaces to the library. </li>
!           <li>Developers may use the service to create a variety of custom search interfaces, access the data in the DLESE repository, or conduct research about the library repository and it's contents</li>
!         </ul>
!     </li>
!     <li>The <a href="javascript_search_service.html">JavaScript search service</a> provides a JavaScript interface to DLESE's search functionality. This service and framework allows DLESE search to be inserted into a web page using simply HTML, JavaScript and CSS, making custom DLESE search widely accessible for use by web page developers. Use cases for the service include educational design, custom search pages for targeted audiences and other applications where the dynamic content of the library may be useful. </li>
!   </ul>
!   <li>Assumptions and policies
!       <ul>
!         <li>Extra weight will be applied to reviewed items when ranking, if possible. There is no policy to support this at this time. </li>
!         <li>Only one entry will be displayed for resources that have multiple records from separate collections associated with it. </li>
!         <li>Branding information identifying the contributing collection will be visible with each record returned. </li>
!         <li>Annotation information will be linked from results. </li>
!         <li>In keeping with DLESE privacy policy, contact information for record creators will not be displayed in service responses. </li>
!       </ul>
!   </li>
!   <h3>12. DSV - Library search and browse interface </h3>
!   <p>Users who visit the library at www.dlese.org interact with the DLESE Search View (DSV) application. The DSV is a client application built using the DLESE Search Web Service and provides the primary  user interface for searching and browsing the resources, collections, and annotations in the library.</p>
!   <h3>12. Search clients</h3>
! <ul>
!   <li>In addition to the DSV, a variety of additional search clients are built using  DLESE's <a href="search_web_services.html">Search Web Service</a> and <a href="javascript_search_service.html">JavaScript Search Service</a> to provide custom, contextualized user interfaces   over the library collections, or are used for data analysis or research purposes. Clients that access the search web service are implemented using application software such as Tomcat / JSP, PHP, Java or other environments that are able to communicate using  web service protocols and parse  XML data for display or data analysis purposes. Clients that access the JavaScript service are implemented  using HTML, JavaScript and CSS and are available for access using standard web browsers.
! Some example clients:  
!     <ul>
!       <li>The <a href="http://www.globe.gov/tctg/tgchapter.jsp?sectionId=1">GLOBE project</a> uses the search web service to provide access to DLESE resources from within the Teacher's Guide portion of their site. </li>
!       <li>The <a href="http://www.cosee.net/">Center for Ocean Science Education Excellence</a> (COSEE) uses the search web service to provide a custom search interface for their web site visitors. </li>
!       <li>The news and opportunities portion of the DLESE web site uses the search web service to provide a search interface for community-related news and opportunities.</li>
!       <li>The Creator Acknowledgement System (CAS) provides a search interface that uses the search web service to display resources in the library that are attributed to an individual or institution. The CAS also uses the web service internally to determine which resources are new to the library and who needs to be e-mailed to notify them that their resources have been included in the library. </li>
!       <li>Several other clients have been built that use the service such as the Strand Map Service, the Idea Keeper, and a number of additional search pages for DLESE partners. </li>
!     </ul>
!   </li>
! </ul>
! <h3>13. OAI data provider - Export via Open Archives Initiative Protocol for Metadata Harvesting (OAI-PMH)</h3>
! 
! <ul>
!   <li>External partners wishing to gain full access to the DLESE data store may harvest records using the OAI-PMH in all available DLESE formats. </li>
!   <li>Dublin Core format made available for export to external OAI-complient repositories. The qualified NSDL Dublin Core format is made available for the NSDL. </li>
!   <li>Assumptions and policies
!       <ul>
!         <li>Records from external collections will only be made available for those collections who wish DLESE to proxy their data. </li>
!         <li>IP and privacy policies for each collection apply to harvested metadata.
!             <ul>
!               <li>In keeping with DLESE privacy policy, contact information for record creators will not distributed. </li>
!             </ul>
!         </li>
!         <li>Will all items in data store be harvestable via OAI or only those discoverable in DLESE .. Policy decision needed here.</li>
!       </ul>
!   </li>
! </ul>
! <p><br>
!   <i>Last updated: May, 2007</i><br>
!   <i>Author: John Weatherley</i><br>
! </p>
! </body>
! </html>
! 
! 
! 

Index: dlese_architecture_overview.ppt
===================================================================
RCS file: /cvsroot/dlese/dds-project/docs/dlese_architecture_overview.ppt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
Binary files /tmp/cvsuQZmaN and /tmp/cvsb7PO8B differ

Index: javascript_search_service.html
===================================================================
RCS file: /cvsroot/dlese/dds-project/docs/javascript_search_service.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** javascript_search_service.html	28 Jun 2005 23:43:51 -0000	1.2
--- javascript_search_service.html	4 May 2007 23:36:15 -0000	1.3
***************
*** 1,50 ****
! <html>
! <head>
! <title> Documentation for the DLESE JavaScript Search Service </title>
! 	<link rel="stylesheet" type="text/css" href="/dlese_shared/dlese_styles.css" />
! 	<link rel="stylesheet" type="text/css" href="/libdev/docs/docs_styles.css" />
! </head>
! <body>
! <h1> Documentation for the DLESE 
!     JavaScript Search Service </h1>
! <h2> Version 1.1</h2>
! <p>JSHTML 1.1 is part of DLESE v2.3</p>
! <h2> Description </h2> 
! <p>The DLESE JavaScript Search  Service is used by internal and external web developers to create custom DLESE search web pages and to display  DLESE resources dynamically in static HTML pages. To implement a client, developers need only to use HTML, JavaScript and CSS, and  clients can be deployed to any static-page web server without the need to run CGI, Tomcat or other application software. The service returns HTML as a JavaScript write( ) statement, which is inserted into the static page using a JavaScript-based service API. Using the API, developers are able to customize both  the functional and display features of their client.  Functional features include the ability to limit the search page scope to a given sub-set of resources that are defined by term or field, ability to boost results that contain given terms or fields, and the ability to define and render custom menus and smart links that are defined by terms or fields. Display features include the ability to display or omit various HTML elements  in the search page. The available elements for display include a text form for submitting a search, menus for selecting grade levels, subjects, resource types, collection or standards, and control over what is displayed in the search results. </p>
! <h2> Audience </h2> 
! <p> This service is meant to be used by web page developers, library developers, educational designers or others wishing to incorporate DLESE resources and search functionality into their web sites.
! </p>
! <h2> How this component is used </h2>
! <p>The DLESE JavaScript search service is used by internal and external web developers to create custom DLESE search web pages and to display DLESE resources dynamically in static HTML pages. To implement a client, developers need only to use HTML, JavaScript and CSS, and clients can be deployed to any static-page web server without the need to run CGI, Tomcat or other application software.</p>
! <h2> Functional requirements </h2>
! <ul>
!   <li>Support distributed access to DLESE's search functionality repository of library resources.</li>
!   <li>Support the design, development and deployment of custom  interfaces that access and display DLESE resources.</li>
!   <li>Use technology that is readily available, relatively easy use, and can be deployed to a static web server.</li>
! </ul>
! <h2> Technologies used </h2>
! <p>The service is implement using Java 1.4, J2EE, Struts, Lucene 1.4, Tomcat 5, Dom4j, JSTL 1.1 tag libraries. Clients that access the service are implemented using HTML, JavaScript and CSS.
! </p>
! <h2> Development process and workflow </h2>
! <p>See the <a href="software-development-process.html">development process documentation</a>. </p>
! <h2>Dependencies on other DLESE components </h2>
! <p>The JavaScript search  service is built over the <a href="dds-documentation.html">DLESE Discovery System</a> (DDS). </p>
! <h2> Testing and maintenance procedures </h2>
! <p>See the <a href="software-development-process.html#testing">development process 
!   documentation section on testing</a>. 
! </p>
! <h2> Links to additional documentation </h2>
! <ul>
!   <li>The <a href="http://www.dlese.org/dds/services/jshtml1-1/">DLESE JavaScript Search Service home page</a>. </li>
!   <li>The <a href="http://www.dlese.org/dds/services/">DLESE Services portal</a>.</li>
! </ul>
! <p>
! <i>Contact: <a href="mailto:su...@dl...">su...@dl...</a></i><br>
!   <i>Last updated: June 28, 2005</i><br>
!   <i>Author: John Weatherley</i><br>
! </p>
! </body>
! </html>
! 
! 
! 
--- 1,48 ----
! <html>
! <head>
! <title> Documentation for the DLESE JavaScript Search Service </title>
! 	<link rel="stylesheet" type="text/css" href="/dlese_shared/dlese_styles.css" />
! 	<link rel="stylesheet" type="text/css" href="/libdev/docs/docs_styles.css" />
! </head>
! <body>
! <h1> Documentation for the DLESE 
!     JavaScript Search Service </h1>
! <h2> Version 1.1</h2>
! <h2> Description </h2> 
! <p>The DLESE JavaScript Search  Service is used by internal and external web developers to create custom DLESE search web pages and to display  DLESE resources dynamically in static HTML pages. To implement a client, developers need only to use HTML, JavaScript and CSS, and  clients can be deployed to any static-page web server without the need to run CGI, Tomcat or other application software. The service returns HTML as a JavaScript write( ) statement, which is inserted into the static page using a JavaScript-based service API. Using the API, developers are able to customize both  the functional and display features of their client.  Functional features include the ability to limit the search page scope to a given sub-set of resources that are defined by term or field, ability to boost results that contain given terms or fields, and the ability to define and render custom menus and smart links that are defined by terms or fields. Display features include the ability to display or omit various HTML elements  in the search page. The available elements for display include a text form for submitting a search, menus for selecting grade levels, subjects, resource types, collection or standards, and control over what is displayed in the search results. </p>
! <h2> Audience </h2> 
! <p> This service is meant to be used by web page developers, library developers, educational designers or others wishing to incorporate DLESE resources and search functionality into their web sites.
! </p>
! <h2> How this component is used </h2>
! <p>The DLESE JavaScript search service is used by internal and external web developers to create custom DLESE search web pages and to display DLESE resources dynamically in static HTML pages. To implement a client, developers need only to use HTML, JavaScript and CSS, and clients can be deployed to any static-page web server without the need to run CGI, Tomcat or other application software.</p>
! <h2> Functional requirements </h2>
! <ul>
!   <li>Support distributed access to DLESE's search functionality repository of library resources.</li>
!   <li>Support the design, development and deployment of custom  interfaces that access and display DLESE resources.</li>
!   <li>Use technology that is readily available, relatively easy use, and can be deployed to a static web server.</li>
! </ul>
! <h2> Technologies used </h2>
! <p>The service is implement using Java 1.4, J2EE, Struts, Lucene 1.4, Tomcat 5, Dom4j, JSTL 1.1 tag libraries. Clients that access the service are implemented using HTML, JavaScript and CSS.
! </p>
! <h2> Development process and workflow </h2>
! <p>See the <a href="software-development-process.html">development process documentation</a>. </p>
! <h2>Dependencies on other DLESE components </h2>
! <p>The JavaScript search  service is built over the <a href="dds-documentation.html">DLESE Discovery System</a> (DDS). </p>
! <h2> Testing and maintenance procedures </h2>
! <p>See the <a href="software-development-process.html#testing">development process 
!   documentation section on testing</a>. 
! </p>
! <h2> Links to additional documentation </h2>
! <ul>
!   <li>The <a href="http://www.dlese.org/dds/services/jshtml1-1/">DLESE JavaScript Search Service home page</a>. </li>
!   <li>The <a href="http://www.dlese.org/dds/services/">DLESE Services portal</a>.</li>
! </ul>
! <p><br>
!   <i>Last updated: May 2007 </i><br>
!   <i>Author: John Weatherley</i><br>
! </p>
! </body>
! </html>
! 
! 
! 

Index: search_web_services.html
===================================================================
RCS file: /cvsroot/dlese/dds-project/docs/search_web_services.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** search_web_services.html	12 Oct 2006 23:32:19 -0000	1.3
--- search_web_services.html	4 May 2007 23:36:15 -0000	1.4
***************
*** 9,13 ****
      Search Web Service</h1>
  <h2> Version 1.1 </h2>
! <p>DDSWS 1.1 is part of DLESE v2.4 <br>
  <a href="http://cvs.sourceforge.net/viewcvs.py/dlese/dds-project/docs/CHANGES-DDSWS.txt?view=markup">Changes since last release</a></p>
  <h2> Description </h2> 
--- 9,13 ----
      Search Web Service</h1>
  <h2> Version 1.1 </h2>
! <p>
  <a href="http://cvs.sourceforge.net/viewcvs.py/dlese/dds-project/docs/CHANGES-DDSWS.txt?view=markup">Changes since last release</a></p>
  <h2> Description </h2> 
***************
*** 45,51 ****
    <li>The <a href="http://www.dlese.org/dds/services/examples/ddsws/">JSP client template and examples</a>. </li>
  </ul>
! <p>
! <i>Contact: <a href="mailto:su...@dl...">su...@dl...</a></i><br>
!   <i>Last updated: Oct 12, 2006</i><br>
    <i>Author: John Weatherley</i><br>
  </p>
--- 45,50 ----
    <li>The <a href="http://www.dlese.org/dds/services/examples/ddsws/">JSP client template and examples</a>. </li>
  </ul>
! <p><br>
!   <i>Last updated: May, 2007 </i><br>
    <i>Author: John Weatherley</i><br>
  </p>

Index: software-development-process.html
===================================================================
RCS file: /cvsroot/dlese/dds-project/docs/software-development-process.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** software-development-process.html	17 Jun 2005 23:30:16 -0000	1.8
--- software-development-process.html	4 May 2007 23:36:15 -0000	1.9
***************
*** 1,397 ****
! <html>
! <head>
! <title> Documentation for the software development process at DLESE </title>
! 
! 	<link rel="stylesheet" type="text/css" href="/dlese_shared/dlese_styles.css" />
! 	<link rel="stylesheet" type="text/css" href="/libdev/docs/docs_styles.css" />
! 
! </head>
! <body>
! <h1> Documentation for the software development process at DLESE</h1>
! <h2>Version 2.0 </h2>
! <p>Development process v2.0 corresponds to DLESE v2.3</p>
! <h2>Description </h2>
! <p>The software development process and workflow at DLESE is designed to enable 
!   flexible and incremental development of software conducted concurrently by multiple 
!   software engineers, web designers and others in a distributed fashion. The process 
!   enables uniform, reliable, team-oriented concurrent development of the major 
!   web applications in the library, such as the <a href="dds-documentation.html">DLESE Discovery System</a> (DDS), the <a href="DCS.html">DLESE Collection System</a> (DCS), and 
!   the <a href="oai-documentation.html">DLESE OAI software</a>. This process is also being applied in part or in full 
!   to a number of sub-components and services in the library including the DLESE 
!   Java libraries, the IDMapper service, the Contributor Acknowledgement System (CAS), the vocabulary manager, metadata frameworks 
!   development, the registration service, web log analysis services, and the shared 
!   UI components used throughout the distributed DLESE web sites. Note that the 
!   process of software design and the identification of functional requirements 
!   is not discussed here.</p>
! <h3>Overview of the development process</h3>
! <p>The software development 
!     process diagram below shows the flow of development for a typical web application 
!   such as the DDS, the DCS or the DLESE OAI software. </p>
! <p><img src="development-process-diagram.png" width="750" height="563"></p>
! <p>The numbered items in the diagram 
!     indicate the progression of development over time, which is detailed here:</p>
! <p>1. The developer checks out or updates his or her code and files from the main 
!   CVS repository (see the <a href="#cvs">CVS repository description</a> below). 
!   Each time the developer performs an update, he or she will receive changes made 
!   by other developers working on the project and obtain the latest version of 
!   the software under development. Alternatively, developers may request older 
!   versions of the code and files to work on, if necessary.</p>
! <p>2. Once the developer has updated their working copy of the code and files, 
!   he or she performs an Ant build to compile the software and deploy it to their 
!   personal application server (Tomcat) (see the <a href="#build">software build 
!     description</a> below). The developer can then accesses their server to inspect 
!   the changes that others have committed. The developer will then make changes 
!   to their working copy to add or change functionality, which typically involves 
!   making changes, deploying them to the application server, inspecting, testing 
!   and verifying them multiple times in an iterative fashion. While working in 
!   their development area, the changes that they make are not available to other 
!   developers until they are committed to CVS.</p>
! <p>3. The developer then commits the changes he or she has made to the global 
!   CVS repository, and enters notes about those changes that other developers can 
!   read. Typically commits are made once the developer has verified that the changes 
!   they have made will not break the software or disrupt the work of other developers. 
!   When changes are committed, other developers are notified automatically by e-mail 
!   and they may then update their working copy to obtain the changes when they 
!   are ready. </p>
! <p>4. At major and minor release points, a web administrator will check out the 
!   code and files to perform a master build. Major release points occur infrequently 
!   and involve major changes in the software. Minor release points occur more frequently, 
!   on the order of once or twice a month, and involve small changes in the UI and/or 
!   small bug fixes.</p>
! <p>5. The web admin builds the updated software to an integration server for testing. 
!   The integration server closely mirrors the live environment by bringing together 
!   multiple components of the library that interact with the software. Once built, 
!   DLESE staff performs a series of tests to verify the software (see the <a href="#testing">testing 
!     procedures description</a> below). Bugs that are detected are sent back to 
!   developers for fixes. Fixes then get re-updated to the integration server and 
!   re tested until found satisfactory.</p>
! <p>6. Once the software has completed testing, the web administrator performs 
!   a build to the live web application server. During this build process, traffic 
!   is re-directed through the integration server so that users will see no down 
!   time. Once the build is complete, traffic is once again directed to the live 
!   server. Finally, an administrator tags the code and files in CVS with a version 
!   number for future retrieval by version, if necessary (see the <a href="#versioning">software 
!     versioning description</a> below).</p>
! <h3><a name="structure"></a>Software project structure</h3>
! <p>The typical software project contains all the files and libraries necessary 
!   to build the software within a single directory. Each project resides in the 
!   DLESE CVS repository on SourceForge (<a href="http://cvs.sourceforge.net/viewcvs.py/dlese/">CVS 
!     View</a>). As a rule, each project directory is nam...
 
[truncated message content]

[Dlese-dds-project] CVS: dds-project/web/WEB-INF/xsl_files adn-v0.6.50-to-nsdl_dc-v1.02-asn-identifiers.xsl, NONE, 1.1

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

Update of /cvsroot/dlese/dds-project/web/WEB-INF/xsl_files
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv30058/web/WEB-INF/xsl_files

Added Files:
	adn-v0.6.50-to-nsdl_dc-v1.02-asn-identifiers.xsl 
Log Message:
-Updated the ADN to nsdl_dc XML converter to translate standards to ASN identifiers

--- NEW FILE ---
<?xml version="1.0"?>
<xsl:stylesheet 
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
    xmlns:xsi ="http://www.w3.org/2001/XMLSchema-instance"
    xmlns:d="http://adn.dlese.org"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:nsdl_dc="http://ns.nsdl.org/nsdl_dc_v1.02/"
    xmlns:dct="http://purl.org/dc/terms/"
    xmlns:ieee="http://www.ieee.org/xsd/LOMv1p0"
    xmlns:ws="http://www.dlese.org/Metadata/ddsws"
    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
    exclude-result-prefixes="xsi d ws xsd"
    version="1.0">

<!--ORGANIZATION OF THIS FILE-->
<!-- **************************************-->
<!--This file is organized into the following sections: Purpose, License information and credits, Assumptions, Other stylesheets, Variables, Transformation code, Templates-->

<!--PURPOSE-->
[...2429 lines suppressed...]
					<xsl:text>application/x-compress</xsl:text>
				</xsl:when>

				<xsl:when test="contains($lowercase, '.z')">
					<xsl:text>application/x-compress</xsl:text>
				</xsl:when>

				<xsl:when test="contains($lowercase, '.zip')">
					<xsl:attribute name="xsi:type">dct:IMT</xsl:attribute>
					<xsl:text>application/zip</xsl:text>
				</xsl:when>

				<xsl:otherwise>
					<xsl:attribute name="xsi:type">dct:IMT</xsl:attribute>
					<xsl:text>text/html</xsl:text>
				</xsl:otherwise>
			</xsl:choose>
		</xsl:element>
	</xsl:template>
</xsl:stylesheet>

[Dlese-dds-project] CVS: dds-project/web/WEB-INF web.xml, 1.96, 1.97

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

Update of /cvsroot/dlese/dds-project/web/WEB-INF
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv30058/web/WEB-INF

Modified Files:
	web.xml 
Log Message:
-Updated the ADN to nsdl_dc XML converter to translate standards to ASN identifiers

Index: web.xml
===================================================================
RCS file: /cvsroot/dlese/dds-project/web/WEB-INF/web.xml,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -r1.96 -r1.97
*** web.xml	14 Feb 2007 17:51:15 -0000	1.96
--- web.xml	27 Apr 2007 14:54:05 -0000	1.97
***************
*** 250,254 ****
  	  <param-name>xslconverter - Converts from news_opps to news_opps localized</param-name>    
  	  <param-value>remove-namespaces-and-localize.xsl|news_opps|news_opps-localized</param-value>  
! 	</context-param>		
  	
  	<!-- To configure a format converter that uses a Java class, the param-name must begin with
--- 250,258 ----
  	  <param-name>xslconverter - Converts from news_opps to news_opps localized</param-name>    
  	  <param-value>remove-namespaces-and-localize.xsl|news_opps|news_opps-localized</param-value>  
! 	</context-param>
! 	<context-param>  
!       <param-name>xslconverter - adn to nsdl_dc converter</param-name>  
!       <param-value>adn-v0.6.50-to-nsdl_dc-v1.02-asn-identifiers.xsl|adn|nsdl_dc</param-value>  
!     </context-param>	
  	
  	<!-- To configure a format converter that uses a Java class, the param-name must begin with
***************
*** 258,265 ****
  	and be placed in the class path for this servlet -->	
  	<context-param>  
- 	  <param-name>javaconverter - Converts from adn to the NSDL DC format</param-name>    
- 	  <param-value>org.dlese.dpc.xml.ADNToNSDLDCFormatConverter|adn|nsdl_dc</param-value>  
- 	</context-param>
- 	<context-param>  
  	  <param-name>javaconverter - Converts from adn to the OAI DC format</param-name>    
  	  <param-value>org.dlese.dpc.xml.ADNToOAIDCFormatConverter|adn|oai_dc</param-value>  
--- 262,265 ----
***************
*** 275,279 ****
  	<context-param>  
        <param-name>adn-to-nsdl-dc-xsl</param-name>  
!       <param-value>adn-v0.6.50-to-nsdl_dc-v1.02.xsl</param-value>  
  	</context-param>	
  	<context-param>  
--- 275,280 ----
  	<context-param>  
        <param-name>adn-to-nsdl-dc-xsl</param-name>  
!       <param-value>adn-v0.6.50-to-nsdl_dc-v1.02-asn-identifiers.xsl</param-value>
! 	  <!-- <param-value>adn-v0.6.50-to-nsdl_dc-v1.02.xsl</param-value> -->
  	</context-param>	
  	<context-param>  

[Dlese-dds-project] CVS: dds-project/docs CHANGES.txt,1.98,1.99

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

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

Modified Files:
	CHANGES.txt 
Log Message:
-Updated the ADN to nsdl_dc XML converter to translate standards to ASN identifiers

Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/dlese/dds-project/docs/CHANGES.txt,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -r1.98 -r1.99
*** CHANGES.txt	19 Mar 2007 18:46:56 -0000	1.98
--- CHANGES.txt	27 Apr 2007 14:54:05 -0000	1.99
***************
*** 18,21 ****
--- 18,23 ----
  now work properly on Windows. Index Writers expect that the files reside in UTF-8 encoding.
  
+ -Updated the ADN to nsdl_dc XML converter to translate standards to ASN identifiers
+ 
  
  Changes in v3.3.7 (released Feb 23, 2007)

[Dlese-dds-project] CVS: dds-project/docs CHANGES.txt,1.97,1.98

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

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

Modified Files:
	CHANGES.txt 
Log Message:
-updated docs

Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/dlese/dds-project/docs/CHANGES.txt,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -r1.97 -r1.98
*** CHANGES.txt	19 Mar 2007 17:02:54 -0000	1.97
--- CHANGES.txt	19 Mar 2007 18:46:56 -0000	1.98
***************
*** 16,20 ****
  native system encoding type (rt ticket 6937). LC_CTYPE no longer needs to be set to UTF-8 in unix
  environments (effects collection docs and other XML formats), and encoding should
! now work properly on Windows. Expects the files reside in UTF-8 encoding.
  
  
--- 16,20 ----
  native system encoding type (rt ticket 6937). LC_CTYPE no longer needs to be set to UTF-8 in unix
  environments (effects collection docs and other XML formats), and encoding should
! now work properly on Windows. Index Writers expect that the files reside in UTF-8 encoding.
  
  

[Dlese-dds-project] CVS: dds-project/docs CHANGES.txt,1.96,1.97

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

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

Modified Files:
	CHANGES.txt 
Log Message:
-added comments about utf-8 fix

Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/dlese/dds-project/docs/CHANGES.txt,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -r1.96 -r1.97
*** CHANGES.txt	23 Feb 2007 21:31:08 -0000	1.96
--- CHANGES.txt	19 Mar 2007 17:02:54 -0000	1.97
***************
*** 10,13 ****
--- 10,22 ----
  -----------------------------------------------------------------------------
  
+ 
+ Changes in v3.3.8 
+ 
+ -Files are now explicitly read into the index using UTF-8 encoding instead of the 
+ native system encoding type (rt ticket 6937). LC_CTYPE no longer needs to be set to UTF-8 in unix
+ environments (effects collection docs and other XML formats), and encoding should
+ now work properly on Windows. Expects the files reside in UTF-8 encoding.
+ 
+ 
  Changes in v3.3.7 (released Feb 23, 2007)
  

[Dlese-dds-project] CVS: dds-project build.xml,1.116,1.117

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

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

Modified Files:
	build.xml 
Log Message:
upped version

Index: build.xml
===================================================================
RCS file: /cvsroot/dlese/dds-project/build.xml,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -r1.116 -r1.117
*** build.xml	2 Feb 2007 00:46:42 -0000	1.116
--- build.xml	19 Mar 2007 17:08:36 -0000	1.117
***************
*** 149,153 ****
   
    <property name="app.name" 			value="dds"/> 
!   <property name="app.version" 			value="3.3.7"/>
    <property name="dds.context.name"		value="${app.name}"/>
    <property name="deploy.context.name"	value="${dds.context.name}"/> 
--- 149,153 ----
   
    <property name="app.name" 			value="dds"/> 
!   <property name="app.version" 			value="3.3.8"/>
    <property name="dds.context.name"		value="${app.name}"/>
    <property name="deploy.context.name"	value="${dds.context.name}"/> 

[Dlese-dds-project] CVS: dds-project/docs CHANGES.txt,1.95,1.96

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

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

Modified Files:
	CHANGES.txt 
Log Message:
sp

Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/dlese/dds-project/docs/CHANGES.txt,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -r1.95 -r1.96
*** CHANGES.txt	23 Feb 2007 21:23:32 -0000	1.95
--- CHANGES.txt	23 Feb 2007 21:31:08 -0000	1.96
***************
*** 15,19 ****
  format converters, which propagated as data corruption in the DDSWS web service
  output (this caused CAS to throw an error). Fixed by applying synchronization 
! in the XSLConversionService to address this concurrency-related issue. 
  
  -Added a report in the admin area that tabulates the number of resources in the library
--- 15,19 ----
  format converters, which propagated as data corruption in the DDSWS web service
  output (this caused CAS to throw an error). Fixed by applying synchronization 
! in the XMLConversionService to address this concurrency-related issue. 
  
  -Added a report in the admin area that tabulates the number of resources in the library

[Dlese-dds-project] CVS: dds-project/docs CHANGES.txt,1.94,1.95

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

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

Modified Files:
	CHANGES.txt 
Log Message:


Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/dlese/dds-project/docs/CHANGES.txt,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -r1.94 -r1.95
*** CHANGES.txt	23 Feb 2007 21:19:05 -0000	1.94
--- CHANGES.txt	23 Feb 2007 21:23:32 -0000	1.95
***************
*** 13,18 ****
  
  -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). Fixed by applying sychronization 
  in the XSLConversionService to address this concurrency-related issue. 
  
--- 13,18 ----
  
  -Fixed issue where corrupt XML data was being seen in the output from XSL 
! format converters, which propagated as data corruption in the DDSWS web service
! output (this caused CAS to throw an error). Fixed by applying synchronization 
  in the XSLConversionService to address this concurrency-related issue. 
  

[Dlese-dds-project] CVS: dds-project/docs CHANGES.txt,1.93,1.94

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

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

Modified Files:
	CHANGES.txt 
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). Fixed by applying sychronization 
in the XSLConversionService to address this concurrency-related issue.

Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/dlese/dds-project/docs/CHANGES.txt,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -r1.93 -r1.94
*** CHANGES.txt	2 Feb 2007 00:46:42 -0000	1.93
--- CHANGES.txt	23 Feb 2007 21:19:05 -0000	1.94
***************
*** 10,14 ****
  -----------------------------------------------------------------------------
  
! Changes in v3.3.7
  
  -Added a report in the admin area that tabulates the number of resources in the library
--- 10,19 ----
  -----------------------------------------------------------------------------
  
! Changes in v3.3.7 (released Feb 23, 2007)
! 
! -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). Fixed by applying sychronization 
! in the XSLConversionService to address this concurrency-related issue. 
  
  -Added a report in the admin area that tabulates the number of resources in the library

[Dlese-dds-project] CVS: dds-project/web/WEB-INF web.xml, 1.95, 1.96

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

Update of /cvsroot/dlese/dds-project/web/WEB-INF
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv25207/web/WEB-INF

Modified Files:
	web.xml 
Log Message:
updated to cms1-1 url

Index: web.xml
===================================================================
RCS file: /cvsroot/dlese/dds-project/web/WEB-INF/web.xml,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -r1.95 -r1.96
*** web.xml	14 Sep 2006 19:25:29 -0000	1.95
--- web.xml	14 Feb 2007 17:51:15 -0000	1.96
***************
*** 205,209 ****
  	<context-param>
  		<param-name>baseCMSURL</param-name>
! 		<param-value>http://cms.dlese.org/cms1-0</param-value>
  		<description>
  			The base URL for the primary Concept Map Service at DLESE.
--- 205,209 ----
  	<context-param>
  		<param-name>baseCMSURL</param-name>
! 		<param-value>http://cms.dlese.org/cms1-1</param-value>
  		<description>
  			The base URL for the primary Concept Map Service at DLESE.

[Dlese-dds-project] CVS: dds-project/web/admin/reporting ucar-member-institutions-report.jsp, 1.4, 1.5

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

Update of /cvsroot/dlese/dds-project/web/admin/reporting
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv9095/web/admin/reporting

Modified Files:
	ucar-member-institutions-report.jsp 
Log Message:
made links open in separate window

Index: ucar-member-institutions-report.jsp
===================================================================
RCS file: /cvsroot/dlese/dds-project/web/admin/reporting/ucar-member-institutions-report.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ucar-member-institutions-report.jsp	2 Feb 2007 00:46:42 -0000	1.4
--- ucar-member-institutions-report.jsp	5 Feb 2007 18:51:55 -0000	1.5
***************
*** 149,153 ****
  								<c:param name="q">${numInstQuery}</c:param>
  							</c:url>
! 							<a href="${qUrl}">${numInst}</a>
  						</td>
  						<td>
--- 149,153 ----
  								<c:param name="q">${numInstQuery}</c:param>
  							</c:url>
! 							<a href="${qUrl}" target="_blank">${numInst}</a>
  						</td>
  						<td>
***************
*** 155,159 ****
  								<c:param name="q">${numMetadataQuery}</c:param>
  							</c:url>				
! 							<a href="${qUrl}">${numMetadata}</a>
  						</td>
  						<td>
--- 155,159 ----
  								<c:param name="q">${numMetadataQuery}</c:param>
  							</c:url>				
! 							<a href="${qUrl}" target="_blank">${numMetadata}</a>
  						</td>
  						<td>
***************
*** 161,165 ****
  								<c:param name="q">${numContentQuery}</c:param>
  							</c:url>			
! 							<a href="${qUrl}">${numContent}</a>
  						</td>
  						<td>
--- 161,165 ----
  								<c:param name="q">${numContentQuery}</c:param>
  							</c:url>			
! 							<a href="${qUrl}" target="_blank">${numContent}</a>
  						</td>
  						<td>
***************
*** 167,171 ****
  								<c:param name="q">${numUrlQuery}</c:param>
  							</c:url>			
! 							<a href="${qUrl}">${numUrl}</a>
  						</td>						
  						<td>
--- 167,171 ----
  								<c:param name="q">${numUrlQuery}</c:param>
  							</c:url>			
! 							<a href="${qUrl}" target="_blank">${numUrl}</a>
  						</td>						
  						<td>
***************
*** 173,177 ****
  								<c:param name="q">${numAnywhereQuery}</c:param>
  							</c:url>					
! 							<a href="${qUrl}">${numAnywhere}</a>
  						</td>				
  					</tr>
--- 173,177 ----
  								<c:param name="q">${numAnywhereQuery}</c:param>
  							</c:url>					
! 							<a href="${qUrl}" target="_blank">${numAnywhere}</a>
  						</td>				
  					</tr>
***************
*** 243,247 ****
  						<c:param name="q">${numInstQuery}</c:param>
  					</c:url>
! 					<a href="${qUrl}">${numInst}</a>
  				</td>
  				<td>
--- 243,247 ----
  						<c:param name="q">${numInstQuery}</c:param>
  					</c:url>
! 					<a href="${qUrl}" target="_blank">${numInst}</a>
  				</td>
  				<td>
***************
*** 249,253 ****
  						<c:param name="q">${numMetadataQuery}</c:param>
  					</c:url>				
! 					<a href="${qUrl}">${numMetadata}</a>
  				</td>
  				<td>
--- 249,253 ----
  						<c:param name="q">${numMetadataQuery}</c:param>
  					</c:url>				
! 					<a href="${qUrl}" target="_blank">${numMetadata}</a>
  				</td>
  				<td>
***************
*** 255,259 ****
  						<c:param name="q">${numContentQuery}</c:param>
  					</c:url>			
! 					<a href="${qUrl}">${numContent}</a>
  				</td>
  				<td>
--- 255,259 ----
  						<c:param name="q">${numContentQuery}</c:param>
  					</c:url>			
! 					<a href="${qUrl}" target="_blank">${numContent}</a>
  				</td>
  				<td>
***************
*** 261,265 ****
  						<c:param name="q">${numUrlQuery}</c:param>
  					</c:url>			
! 					<a href="${qUrl}">${numUrl}</a>
  				</td>				
  				<td>
--- 261,265 ----
  						<c:param name="q">${numUrlQuery}</c:param>
  					</c:url>			
! 					<a href="${qUrl}" target="_blank">${numUrl}</a>
  				</td>				
  				<td>
***************
*** 267,271 ****
  						<c:param name="q">${numAnywhereQuery}</c:param>
  					</c:url>					
! 					<a href="${qUrl}">${numAnywhere}</a>
  				</td>				
  			</tr>
--- 267,271 ----
  						<c:param name="q">${numAnywhereQuery}</c:param>
  					</c:url>					
! 					<a href="${qUrl}" target="_blank">${numAnywhere}</a>
  				</td>				
  			</tr>
***************
*** 280,284 ****
  						<c:param name="q">${totalResourcesQuery}</c:param>
  					</c:url>					
! 					<a href="${qUrl}">${totalResources}</a>
  				</td>	
  			</tr>
--- 280,284 ----
  						<c:param name="q">${totalResourcesQuery}</c:param>
  					</c:url>					
! 					<a href="${qUrl}" target="_blank">${totalResources}</a>
  				</td>	
  			</tr>

[Dlese-dds-project] CVS: dds-project/web/admin/reporting ucar-member-institutions-report.jsp, 1.3, 1.4 ucar-member-institutions.xml, 1.2, 1.3

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

Update of /cvsroot/dlese/dds-project/web/admin/reporting
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv31514/web/admin/reporting

Modified Files:
	ucar-member-institutions-report.jsp 
	ucar-member-institutions.xml 
Log Message:
-updated ucar member report to include search by url and full metadata
-updated documentation with more info on search fields

Index: ucar-member-institutions-report.jsp
===================================================================
RCS file: /cvsroot/dlese/dds-project/web/admin/reporting/ucar-member-institutions-report.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ucar-member-institutions-report.jsp	31 Jan 2007 20:01:39 -0000	1.3
--- ucar-member-institutions-report.jsp	2 Feb 2007 00:46:42 -0000	1.4
***************
*** 42,53 ****
  	<c:set var="instCount" value="0"/>
  	<c:set var="concatInstNames" value=""/>
  	
! 	<table border=1 cellpadding=4 cellspacing=0>		
  		<tr>
  			<th colspan="2">Institution Name</th>
! 			<th>Appears in<br/>organization field</th>
! 			<th>Appears in<br/>text of metadata</th>
! 			<th>Appears in<br/>site content</th>
! 			<th>Appears<br/>anywhere</th>							
  		</tr>
  		<x:forEach var="inst" varStatus="i" select="$instXml/institutions/table/tr/td">
--- 42,55 ----
  	<c:set var="instCount" value="0"/>
  	<c:set var="concatInstNames" value=""/>
+ 	<c:set var="concatUrls" value=""/>
  	
! 	<table border="1" cellpadding="4" cellspacing="0" width="90%">		
  		<tr>
  			<th colspan="2">Institution Name</th>
! 			<th>Institution name found in<br/>contributor field</th>
! 			<th>Institution name found in<br/>any metadata field</th>
! 			<th>Institution name found in<br/>site content</th>
! 			<th>Institution domain found in<br/>URL field</th>			
! 			<th>Institution name or domain found<br/>anywhere in metadata or content</th>							
  		</tr>
  		<x:forEach var="inst" varStatus="i" select="$instXml/institutions/table/tr/td">
***************
*** 55,65 ****
  				<x:when select="$inst[@type='headRow']">
  					<c:set var="instCount" value="0"/>
! 					<th colspan="6"><x:out select="$inst"/></th>
  				</x:when>
  				<x:otherwise>
  					<c:set var="instName"><x:out select="$inst/p/a/b|$inst/p/b/a"/></c:set>
  					<%
  						try {
  							String instName = (String) pageContext.getAttribute("instName");
  							instName = instName.replaceAll("\\s+", " ");
  							
--- 57,77 ----
  				<x:when select="$inst[@type='headRow']">
  					<c:set var="instCount" value="0"/>
! 					<th colspan="7"><x:out select="$inst"/></th>
  				</x:when>
  				<x:otherwise>
  					<c:set var="instName"><x:out select="$inst/p/a/b|$inst/p/b/a"/></c:set>
+ 					<c:set var="urlQuery" value=""/>
+ 					<x:forEach var="url" varStatus="j" select="$inst//@href">
+ 						<c:set var="urlString"><x:out select="$url"/></c:set>
+ 						<c:set var="urlCurrent">${f:replaceFirst(urlString,'http://[^\\.]+\\.','')}</c:set>
+ 						<c:set var="urlCurrent">h*${f:replaceFirst(urlCurrent,'[/|:].*','')}*</c:set>
+ 						<c:set var="urlQuery">${urlQuery}${j.first ? '' : ' OR '}${urlCurrent}</c:set> 
+ 					</x:forEach>
+ 					<c:set var="urlQuery">${urlQuery}</c:set>
  					<%
  						try {
  							String instName = (String) pageContext.getAttribute("instName");
+ 							String urlQuery = (String) pageContext.getAttribute("urlQuery");
+ 
  							instName = instName.replaceAll("\\s+", " ");
  							
***************
*** 81,91 ****
  							pageContext.setAttribute("numInstQuery", query );
  		
! 							query = "(\"" + instName + "\")";
  							query = "(" + query + ") AND xmlFormat:adn";
  							resultDocs = index.searchDocs(query);
  							pageContext.setAttribute("numMetadata", (resultDocs == null ? 0 : resultDocs.length) );
  							pageContext.setAttribute("numMetadataQuery", query );
  							
! 							query = "(\"" + instName + "\") OR itemContent:(\"" + instName + "\") OR organizationInstName:(\"" + instName + "\")";
  							query = "(" + query + ") AND xmlFormat:adn";
  							resultDocs = index.searchDocs(query);
--- 93,108 ----
  							pageContext.setAttribute("numInstQuery", query );
  		
! 							query = "admindefault:(\"" + instName + "\")";
  							query = "(" + query + ") AND xmlFormat:adn";
  							resultDocs = index.searchDocs(query);
  							pageContext.setAttribute("numMetadata", (resultDocs == null ? 0 : resultDocs.length) );
  							pageContext.setAttribute("numMetadataQuery", query );
+ 
+ 							query = "url:(" + urlQuery + ") AND xmlFormat:adn";
+ 							resultDocs = index.searchDocs(query);
+ 							pageContext.setAttribute("numUrl", (resultDocs == null ? 0 : resultDocs.length) );
+ 							pageContext.setAttribute("numUrlQuery", query );
  							
! 							query = "admindefault:(\"" + instName + "\") OR url:(" + urlQuery + ") OR itemContent:(\"" + instName + "\") OR organizationInstName:(\"" + instName + "\")";
  							query = "(" + query + ") AND xmlFormat:adn";
  							resultDocs = index.searchDocs(query);
***************
*** 103,110 ****
  							${instCount}
  						</td>						
! 						<td style="text-align: left; text-transform: capitalize">
! 							${instName}
  							<c:set var="concatInstNames">${concatInstNames}${i.count < 3 ? ' ' : ' OR '}"${instName}"</c:set>
! 						
  							<%-- <ul>
  								<x:forEach var="dept" varStatus="j" select="$inst//ul//li/a">
--- 120,142 ----
  							${instCount}
  						</td>						
! 						<td style="text-align: left;">
! 							<div style="text-transform: capitalize;">
! 								<c:set var="urlString"><x:out select="$inst//@href"/></c:set>
! 								<a href='${urlString}' target="_blank">${instName}</a>
! 							</div>
! 							
! 							<%-- Concatinate the search strings for use below --%>
  							<c:set var="concatInstNames">${concatInstNames}${i.count < 3 ? ' ' : ' OR '}"${instName}"</c:set>
! 							<c:set var="concatUrls">${concatUrls}${i.count < 3 ? ' ' : ' OR '}${urlQuery}</c:set>
! 								
! 							
! 							
! 							<%-- <code><nobr>${urlQuery}</nobr></code> --%>
! 							<%-- <x:forEach var="url" varStatus="j" select="$inst//@href">
! 								<c:set var="urlString"><x:out select="$url"/></c:set>
! 								<a href='${urlString}' target="_blank">${urlString}</a>${j.last ? '' : ','}
! 							</x:forEach> --%>
! 							
! 							
  							<%-- <ul>
  								<x:forEach var="dept" varStatus="j" select="$inst//ul//li/a">
***************
*** 133,136 ****
--- 165,174 ----
  						<td>
  							<c:url var="qUrl" value='/admin/query.do'>
+ 								<c:param name="q">${numUrlQuery}</c:param>
+ 							</c:url>			
+ 							<a href="${qUrl}">${numUrl}</a>
+ 						</td>						
+ 						<td>
+ 							<c:url var="qUrl" value='/admin/query.do'>
  								<c:param name="q">${numAnywhereQuery}</c:param>
  							</c:url>					
***************
*** 141,149 ****
  			</x:choose>
  		</x:forEach>
! 
  			<%
  				try {
  					String instName = (String) pageContext.getAttribute("concatInstNames");
  					instName = instName.replaceAll("\\s+", " ");
  					
  					ResultDoc[] resultDocs = null;
--- 179,190 ----
  			</x:choose>
  		</x:forEach>
! 			
! 			<%-- ======================= Search for all institutions ... ======================= --%>
  			<%
  				try {
  					String instName = (String) pageContext.getAttribute("concatInstNames");
+ 					String urlQuery = (String)  pageContext.getAttribute("concatUrls");
  					instName = instName.replaceAll("\\s+", " ");
+ 					urlQuery = urlQuery.replaceAll("\\s+", " ");
  					
  					ResultDoc[] resultDocs = null;
***************
*** 164,174 ****
  					pageContext.setAttribute("numInstQuery", query );
  		
! 					query = "(" + instName + ")";
  					query = "(" + query + ") AND xmlFormat:adn";
  					resultDocs = index.searchDocs(query);
  					pageContext.setAttribute("numMetadata", (resultDocs == null ? 0 : resultDocs.length) );
  					pageContext.setAttribute("numMetadataQuery", query );
  					
! 					query = "(" + instName + ") OR itemContent:(" + instName + ") OR organizationInstName:(" + instName + ")";
  					query = "(" + query + ") AND xmlFormat:adn";
  					resultDocs = index.searchDocs(query);
--- 205,220 ----
  					pageContext.setAttribute("numInstQuery", query );
  		
! 					query = "admindefault:(" + instName + ")";
  					query = "(" + query + ") AND xmlFormat:adn";
  					resultDocs = index.searchDocs(query);
  					pageContext.setAttribute("numMetadata", (resultDocs == null ? 0 : resultDocs.length) );
  					pageContext.setAttribute("numMetadataQuery", query );
+ 
+ 					query = "url:(" + urlQuery + ") AND xmlFormat:adn";
+ 					resultDocs = index.searchDocs(query);
+ 					pageContext.setAttribute("numUrl", (resultDocs == null ? 0 : resultDocs.length) );
+ 					pageContext.setAttribute("numUrlQuery", query );
  					
! 					query = "admindefault:(" + instName + ") OR url:(" + urlQuery + ") OR itemContent:(" + instName + ") OR organizationInstName:(" + instName + ")";
  					query = "(" + query + ") AND xmlFormat:adn";
  					resultDocs = index.searchDocs(query);
***************
*** 187,195 ****
  			%>
  			
! 			<th colspan="6">All Institutions Combined</th>
  			<tr>
  				<td>&nbsp;</td>						
  				<td style="text-align: left;">
! 					Any Institution (At least one or more institution name appears)
  				</td>
  				<td>
--- 233,241 ----
  			%>
  			
! 			<th colspan="7">All Institutions Combined</th>
  			<tr>
  				<td>&nbsp;</td>						
  				<td style="text-align: left;">
! 					Any Institution (At least one or more institution name / URL appears)
  				</td>
  				<td>
***************
*** 213,216 ****
--- 259,268 ----
  				<td>
  					<c:url var="qUrl" value='/admin/query.do'>
+ 						<c:param name="q">${numUrlQuery}</c:param>
+ 					</c:url>			
+ 					<a href="${qUrl}">${numUrl}</a>
+ 				</td>				
+ 				<td>
+ 					<c:url var="qUrl" value='/admin/query.do'>
  						<c:param name="q">${numAnywhereQuery}</c:param>
  					</c:url>					
***************
*** 221,225 ****
  			<tr>
  				<td>&nbsp;</td>									
! 				<td colspan="4" style="text-align: left;">
  					Total number of resources in library:
  				</td>						
--- 273,277 ----
  			<tr>
  				<td>&nbsp;</td>									
! 				<td colspan="5" style="text-align: left;">
  					Total number of resources in library:
  				</td>						

Index: ucar-member-institutions.xml
===================================================================
RCS file: /cvsroot/dlese/dds-project/web/admin/reporting/ucar-member-institutions.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ucar-member-institutions.xml	31 Jan 2007 18:38:15 -0000	1.2
--- ucar-member-institutions.xml	2 Feb 2007 00:46:42 -0000	1.3
***************
*** 820,824 ****
          </tr>
          <tr> 
!           <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://kfa-juelich.de/"><b>forschungszentrum 
                julich gmbh</b></a></p><b>
                <span class="sidebar">julich, germany</span> </b> </td>
--- 820,824 ----
          </tr>
          <tr> 
!           <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.fz-juelich.de/"><b>forschungszentrum 
                julich gmbh</b></a></p><b>
                <span class="sidebar">julich, germany</span> </b> </td>
***************
*** 876,880 ****
  
                </a><span class="sidebar">seoul</span> </b></p></td>
!           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a>lanzhou institute 
                of plateau atmospheric physics
                </a><span class="sidebar">lanzhou, china</span></b></p></td>
--- 876,880 ----
  
                </a><span class="sidebar">seoul</span> </b></p></td>
!           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.url-not-available.edu/">lanzhou institute 
                of plateau atmospheric physics
                </a><span class="sidebar">lanzhou, china</span></b></p></td>

[Dlese-dds-project] CVS: dds-project/web/services/ddsws1-1 service_specification.jsp, 1.8, 1.9

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

Update of /cvsroot/dlese/dds-project/web/services/ddsws1-1
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv31514/web/services/ddsws1-1

Modified Files:
	service_specification.jsp 
Log Message:
-updated ucar member report to include search by url and full metadata
-updated documentation with more info on search fields

Index: service_specification.jsp
===================================================================
RCS file: /cvsroot/dlese/dds-project/web/services/ddsws1-1/service_specification.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** service_specification.jsp	26 Jun 2006 23:41:36 -0000	1.8
--- service_specification.jsp	2 Feb 2007 00:46:42 -0000	1.9
***************
*** 968,996 ****
  <a name="availableSearchFields"></a>
  <h2>Available search fields</h2>
! This section describes the fields that are available for searching using the <a href="#Search">Search</a> and <a href="#UserSearch">UserSearch</a> requests,
! as well as many of the commands available in the 
! <a href="http://www.dlese.org/dds/services/jshtml1-1/javascript_service_documentation.jsp">JavaScript Search Service</a>. 
! Fields may contain plain text, controlled vocabularies or encoded field values. The index contains fields derived from multiple XML metadata formats. A given field may contain metadata from a single format or from multiple formats as indicated below. Arbitrary Boolean searches may be performed across and within each of these fields using the <a href="http://jakarta.apache.org/lucene/docs/queryparsersyntax.html">Lucene Query Syntax</a> (LQS) supplied in the 'q' argument of the <a href="#Search">Search</a> request. <a href="#Example_search_queries">Example search queries</a> are provided below. <br>
! <br>
! Fields that may be sorted, as indicated, may be supplied in the 'sortAscendingBy' or 'sortDescendingBy' arguments of the <a href="#Search">Search</a> request.<br>
! <br>
! <b>Text fields</b> - These fields contain plain text or, where indicated, text that has been stemmed using the <a href="http://www.tartarus.org/~martin/PorterStemmer/">Porter stemmer algorithm</a>.  <br>
! <br>
! When searching in a text field, exact terms are matched. For example a search for <i>ocean</i> will return all documents that contain the exact term <i>ocean</i> in the given field. When searching in a field that has been stemmed, however, all documents containing morphologically similar terms in the given field will be returned. For example a search for <i>ocean</i> will return all documents that contain the terms <i>ocean, oceans</i> or <i>oceanic</i>. <br>
! <br>
! Note that when searching in a field that has been stemmed, the client must not apply the stemming algorithm to the terms. Stemming will be applied automatically by the search engine for the fields that support it - no pre-processing is necessary by the client.<br>
! <br>
! <ul>
! <li>default - The default field represents the text that is most appropriate for searching by humans using natural language queries. The default field contains text extracted from different locations in the metadata depending on the XML format. The default field is the only field that does not require the use of a field specifier in the LQS query clause (e.g. the clause "default:ocean" and "ocean" are equivalent). May not be sorted. Available for formats:
  <ul>
  <li>adn: Includes title, description, keyword, resource type, subjects, event names, place names, temporal coverage names, terms found in the primary URL, and creators last name. May be sorted.
  <li>dlese_collect: Includes full title, short title, description, subjects, keywords, and terms extracted from the primary URL, scope URL and review process URL.
  <li>dlese_anno: Includes title, description and terms extracted from the URL.
  <li>news_opps: Includes title, description, keywords, announcements, topics, audience, diversities, location, and sponsors institution.
  </ul>
  </ul>
  <br>
  <ul>
! <li>stems - Identical to the default field, however all terms are in stemmed form. May not be sorted. 
  </ul>
  <br>
--- 968,1001 ----
  <a name="availableSearchFields"></a>
  <h2>Available search fields</h2>
! <p>This section describes the fields that are available for searching using the <a href="#Search">Search</a> and <a href="#UserSearch">UserSearch</a> requests,
!   as well as many of the commands available in the 
!     <a href="http://www.dlese.org/dds/services/jshtml1-1/javascript_service_documentation.jsp">JavaScript Search Service</a>. 
!   Fields may contain plain text, controlled vocabularies or encoded field values. The index contains fields derived from multiple XML metadata formats. A given field may contain metadata from a single format or from multiple formats as indicated below. Arbitrary Boolean searches may be performed across and within each of these fields using the <a href="http://jakarta.apache.org/lucene/docs/queryparsersyntax.html">Lucene Query Syntax</a> (LQS) supplied in the 'q' argument of the <a href="#Search">Search</a> request. <a href="#Example_search_queries">Example search queries</a> are provided below. <br>
!   <br>
!   Fields that may be sorted, as indicated, may be supplied in the 'sortAscendingBy' or 'sortDescendingBy' arguments of the <a href="#Search">Search</a> request.<br>
!   <br>
!   <b>Text fields</b> - These fields contain plain text or, where indicated, text that has been stemmed using the <a href="http://www.tartarus.org/~martin/PorterStemmer/">Porter stemmer algorithm</a>.  <br>
!   <br>
!   When searching in a text field, exact terms are matched. For example a search for <i>ocean</i> will return all documents that contain the exact term <i>ocean</i> in the given field. </p>
! <p>When searching in a field that has been stemmed,  all documents containing morphologically similar terms in the given field are matched. For example a search for <i>ocean</i> will return all documents that contain the terms <i>ocean, oceans</i> or <i>oceanic</i>. Note that when searching in a stemmed field, the client should <em>not</em> apply stemming to the terms it supplies for search. Stemming will be applied automatically by the search engine for the fields that support it - no pre-processing is necessary by the client.<br>
!     <br>
! </p>
  <ul>
+ <li>default - The default field represents the text that is most appropriate for searching by humans using natural language queries. The default field contains text extracted from different locations in the metadata depending on the XML format. The default field is the only field that does not require the use of a field specifier in the LQS query clause (e.g. the clause "default:ocean" and "ocean" are equivalent). May not be sorted. Available for all formats. Contains the following content:
+   <ul>
  <li>adn: Includes title, description, keyword, resource type, subjects, event names, place names, temporal coverage names, terms found in the primary URL, and creators last name. May be sorted.
  <li>dlese_collect: Includes full title, short title, description, subjects, keywords, and terms extracted from the primary URL, scope URL and review process URL.
  <li>dlese_anno: Includes title, description and terms extracted from the URL.
  <li>news_opps: Includes title, description, keywords, announcements, topics, audience, diversities, location, and sponsors institution.
+ <li>All other formats: Contains the full content  from all elements within the XML, excluding attributes.
  </ul>
  </ul>
  <br>
  <ul>
! <li>stems - Contains the same content as the default field, however all terms are stemmed. May not be sorted. Available for all formats.
! </ul>
! <br>
! <ul>
! <li>admindefault - Contains the full content  from all elements within the XML, excluding attributes. May not be sorted. Available for all formats. 
  </ul>
  <br>
***************
*** 1000,1004 ****
  <br>
  <ul>
! <li>titlestems - Contains the titles of resources or items, as stemmed text. May not be sorted. Available for formats: adn.
  </ul>
  <br>
--- 1005,1009 ----
  <br>
  <ul>
! <li>titlestems - Contains the same content as the title field, however all terms are stemmed. May not be sorted. Available for formats: adn.
  </ul>
  <br>
***************
*** 1289,1292 ****
--- 1294,1300 ----
  Search for the term 'ocean' in the stems field. This will return documents containing morphologically similar terms including <i>ocean, oceans</i> and <i>oceanic</i>:<br>
    <pre>stems:ocean</pre><br>
+ Search for the terms 'currents in the oceans' in the stems field. Notice that the client should supply the plain english version of the terms without pre-stemming them. In this example  the resulting search matches documents that contain both <em>currents, current </em>or<em> currently</em> AND <em>oceans, ocean, </em>or<em> oceanic</em> (the terms 'in' and 'the' are stop words that are dropped for the purpose of search):<br>
+   <pre>stems:(currents in the oceans)</pre>
+   <br>  
  Search for resources that that have an average star rating of 3.5 to 5.0:<br>
    <pre>itemannoaveragerating:[3.500 TO 5.000]</pre><br>  

[Dlese-dds-project] CVS: dds-project build.xml,1.115,1.116

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

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

Modified Files:
	build.xml 
Log Message:
-updated ucar member report to include search by url and full metadata
-updated documentation with more info on search fields

Index: build.xml
===================================================================
RCS file: /cvsroot/dlese/dds-project/build.xml,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -r1.115 -r1.116
*** build.xml	4 Nov 2006 01:16:53 -0000	1.115
--- build.xml	2 Feb 2007 00:46:42 -0000	1.116
***************
*** 149,153 ****
   
    <property name="app.name" 			value="dds"/> 
!   <property name="app.version" 			value="3.3.6"/>
    <property name="dds.context.name"		value="${app.name}"/>
    <property name="deploy.context.name"	value="${dds.context.name}"/> 
--- 149,153 ----
   
    <property name="app.name" 			value="dds"/> 
!   <property name="app.version" 			value="3.3.7"/>
    <property name="dds.context.name"		value="${app.name}"/>
    <property name="deploy.context.name"	value="${dds.context.name}"/> 

[Dlese-dds-project] CVS: dds-project/docs CHANGES.txt,1.92,1.93

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

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

Modified Files:
	CHANGES.txt 
Log Message:
-updated ucar member report to include search by url and full metadata
-updated documentation with more info on search fields

Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/dlese/dds-project/docs/CHANGES.txt,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -r1.92 -r1.93
*** CHANGES.txt	29 Nov 2006 18:16:28 -0000	1.92
--- CHANGES.txt	2 Feb 2007 00:46:42 -0000	1.93
***************
*** 10,13 ****
--- 10,21 ----
  -----------------------------------------------------------------------------
  
+ Changes in v3.3.7
+ 
+ -Added a report in the admin area that tabulates the number of resources in the library
+ that are associated with UCAR member institutions and affiliates
+ 
+ -Updated DDSWS documentation for some fields that were missing
+ 
+ 
  Changes in v3.3.6 (released Nov 4, 2006)
  

[Dlese-dds-project] CVS: dds-project/web/admin/reporting ucar-member-institutions-report.jsp, 1.2, 1.3

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

Update of /cvsroot/dlese/dds-project/web/admin/reporting
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv20548/web/admin/reporting

Modified Files:
	ucar-member-institutions-report.jsp 
Log Message:
added totals for inst report

Index: ucar-member-institutions-report.jsp
===================================================================
RCS file: /cvsroot/dlese/dds-project/web/admin/reporting/ucar-member-institutions-report.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ucar-member-institutions-report.jsp	31 Jan 2007 18:38:15 -0000	1.2
--- ucar-member-institutions-report.jsp	31 Jan 2007 20:01:39 -0000	1.3
***************
*** 41,44 ****
--- 41,45 ----
  	
  	<c:set var="instCount" value="0"/>
+ 	<c:set var="concatInstNames" value=""/>
  	
  	<table border=1 cellpadding=4 cellspacing=0>		
***************
*** 69,72 ****
--- 70,74 ----
  							
  							query = "itemContent:(\"" + instName + "\")";
+ 							query = "(" + query + ") AND xmlFormat:adn";
  							resultDocs = index.searchDocs(query);
  							pageContext.setAttribute("numContent", (resultDocs == null ? 0 : resultDocs.length) );
***************
*** 74,77 ****
--- 76,80 ----
  							
  							query = "organizationInstName:(\"" + instName + "\")";
+ 							query = "(" + query + ") AND xmlFormat:adn";
  							resultDocs = index.searchDocs(query);
  							pageContext.setAttribute("numInst", (resultDocs == null ? 0 : resultDocs.length) );
***************
*** 79,82 ****
--- 82,86 ----
  		
  							query = "(\"" + instName + "\")";
+ 							query = "(" + query + ") AND xmlFormat:adn";
  							resultDocs = index.searchDocs(query);
  							pageContext.setAttribute("numMetadata", (resultDocs == null ? 0 : resultDocs.length) );
***************
*** 84,87 ****
--- 88,92 ----
  							
  							query = "(\"" + instName + "\") OR itemContent:(\"" + instName + "\") OR organizationInstName:(\"" + instName + "\")";
+ 							query = "(" + query + ") AND xmlFormat:adn";
  							resultDocs = index.searchDocs(query);
  							pageContext.setAttribute("numAnywhere", (resultDocs == null ? 0 : resultDocs.length) );
***************
*** 99,103 ****
  						</td>						
  						<td style="text-align: left; text-transform: capitalize">
! 							${instName} 
  							<%-- <ul>
  								<x:forEach var="dept" varStatus="j" select="$inst//ul//li/a">
--- 104,110 ----
  						</td>						
  						<td style="text-align: left; text-transform: capitalize">
! 							${instName}
! 							<c:set var="concatInstNames">${concatInstNames}${i.count < 3 ? ' ' : ' OR '}"${instName}"</c:set>
! 						
  							<%-- <ul>
  								<x:forEach var="dept" varStatus="j" select="$inst//ul//li/a">
***************
*** 133,141 ****
  				</x:otherwise>
  			</x:choose>
! 		</x:forEach>		
  	</table>
  	
  	<br/><br/><br/>
! 		
  </body>
  </html>
--- 140,244 ----
  				</x:otherwise>
  			</x:choose>
! 		</x:forEach>
! 
! 			<%
! 				try {
! 					String instName = (String) pageContext.getAttribute("concatInstNames");
! 					instName = instName.replaceAll("\\s+", " ");
! 					
! 					ResultDoc[] resultDocs = null;
! 					SimpleLuceneIndex index = (SimpleLuceneIndex) application.getAttribute("index");
! 					
! 					String query = null;
! 					
! 					query = "itemContent:(" + instName + ")";
! 					query = "(" + query + ") AND xmlFormat:adn";
! 					resultDocs = index.searchDocs(query);
! 					pageContext.setAttribute("numContent", (resultDocs == null ? 0 : resultDocs.length) );
! 					pageContext.setAttribute("numContentQuery", query );
! 					
! 					query = "organizationInstName:(" + instName + ")";
! 					query = "(" + query + ") AND xmlFormat:adn";					
! 					resultDocs = index.searchDocs(query);
! 					pageContext.setAttribute("numInst", (resultDocs == null ? 0 : resultDocs.length) );
! 					pageContext.setAttribute("numInstQuery", query );
! 		
! 					query = "(" + instName + ")";
! 					query = "(" + query + ") AND xmlFormat:adn";
! 					resultDocs = index.searchDocs(query);
! 					pageContext.setAttribute("numMetadata", (resultDocs == null ? 0 : resultDocs.length) );
! 					pageContext.setAttribute("numMetadataQuery", query );
! 					
! 					query = "(" + instName + ") OR itemContent:(" + instName + ") OR organizationInstName:(" + instName + ")";
! 					query = "(" + query + ") AND xmlFormat:adn";
! 					resultDocs = index.searchDocs(query);
! 					pageContext.setAttribute("numAnywhere", (resultDocs == null ? 0 : resultDocs.length) );
! 					pageContext.setAttribute("numAnywhereQuery", query );
! 					
! 					query = "xmlFormat:adn";
! 					resultDocs = index.searchDocs(query);
! 					pageContext.setAttribute("totalResources", (resultDocs == null ? 0 : resultDocs.length) );
! 					pageContext.setAttribute("totalResourcesQuery", query );					
! 					
! 				} catch ( Throwable t ) {
! 					System.out.println("Error: " + t );
! 					t.printStackTrace();
! 				}
! 			%>
! 			
! 			<th colspan="6">All Institutions Combined</th>
! 			<tr>
! 				<td>&nbsp;</td>						
! 				<td style="text-align: left;">
! 					Any Institution (At least one or more institution name appears)
! 				</td>
! 				<td>
! 					<c:url var="qUrl" value='/admin/query.do'>
! 						<c:param name="q">${numInstQuery}</c:param>
! 					</c:url>
! 					<a href="${qUrl}">${numInst}</a>
! 				</td>
! 				<td>
! 					<c:url var="qUrl" value='/admin/query.do'>
! 						<c:param name="q">${numMetadataQuery}</c:param>
! 					</c:url>				
! 					<a href="${qUrl}">${numMetadata}</a>
! 				</td>
! 				<td>
! 					<c:url var="qUrl" value='/admin/query.do'>
! 						<c:param name="q">${numContentQuery}</c:param>
! 					</c:url>			
! 					<a href="${qUrl}">${numContent}</a>
! 				</td>
! 				<td>
! 					<c:url var="qUrl" value='/admin/query.do'>
! 						<c:param name="q">${numAnywhereQuery}</c:param>
! 					</c:url>					
! 					<a href="${qUrl}">${numAnywhere}</a>
! 				</td>				
! 			</tr>
! 
! 			<tr>
! 				<td>&nbsp;</td>									
! 				<td colspan="4" style="text-align: left;">
! 					Total number of resources in library:
! 				</td>						
! 				<td>
! 					<c:url var="qUrl" value='/admin/query.do'>
! 						<c:param name="q">${totalResourcesQuery}</c:param>
! 					</c:url>					
! 					<a href="${qUrl}">${totalResources}</a>
! 				</td>	
! 			</tr>
! 			
  	</table>
  	
+ 	
  	<br/><br/><br/>
! 	
! 
! 
! 
! 	
  </body>
  </html>

[Dlese-dds-project] CVS: dds-project/web/admin/reporting ucar-member-institutions-report.jsp, 1.1, 1.2 ucar-member-institutions.xml, 1.1, 1.2

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

Update of /cvsroot/dlese/dds-project/web/admin/reporting
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv23802/web/admin/reporting

Modified Files:
	ucar-member-institutions-report.jsp 
	ucar-member-institutions.xml 
Log Message:
added affiliates to ucar member institutions report

Index: ucar-member-institutions-report.jsp
===================================================================
RCS file: /cvsroot/dlese/dds-project/web/admin/reporting/ucar-member-institutions-report.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ucar-member-institutions-report.jsp	31 Jan 2007 02:22:34 -0000	1.1
--- ucar-member-institutions-report.jsp	31 Jan 2007 18:38:15 -0000	1.2
***************
*** 4,22 ****
  <%@ page import="org.dlese.dpc.index.*" %>
  
- 
- 
- <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
- <%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
- <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
- <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
- <%@ taglib uri="/WEB-INF/tlds/response.tld" prefix="resp" %>
- <%@ taglib uri="/WEB-INF/tlds/request.tld" prefix="req" %>
- <%@ taglib uri="/WEB-INF/tlds/datetime.tld" prefix="dt" %>
- <%@ taglib uri='/WEB-INF/tlds/utils.tld' prefix='util' %>
  <%@ include file="../../JSTLTagLibIncludes.jsp" %>
  
  <html>
  <head>
! <title>UCAR Member Institution Record Count Report</title>
  <link rel='stylesheet' type='text/css' href='../dlese_admin_styles.css'>
  
--- 4,12 ----
  <%@ page import="org.dlese.dpc.index.*" %>
  
  <%@ include file="../../JSTLTagLibIncludes.jsp" %>
  
  <html>
  <head>
! <title>UCAR Member Institutions and Affiliates: Resource Count Report</title>
  <link rel='stylesheet' type='text/css' href='../dlese_admin_styles.css'>
  
***************
*** 43,47 ****
  <body>
  	
! 	<h1>UCAR Member Institution Record Count Report</h1>
  	<p>Date generated: <%= new java.util.Date().toString() %></p>
  
--- 33,37 ----
  <body>
  	
! 	<h1>UCAR Member Institutions and Affiliates: Resource Count Report</h1>
  	<p>Date generated: <%= new java.util.Date().toString() %></p>
  
***************
*** 50,56 ****
  	</x:parse>
  	
  	<table border=1 cellpadding=4 cellspacing=0>		
  		<tr>
! 			<th>Institution Name</th>
  			<th>Appears in<br/>organization field</th>
  			<th>Appears in<br/>text of metadata</th>
--- 40,48 ----
  	</x:parse>
  	
+ 	<c:set var="instCount" value="0"/>
+ 	
  	<table border=1 cellpadding=4 cellspacing=0>		
  		<tr>
! 			<th colspan="2">Institution Name</th>
  			<th>Appears in<br/>organization field</th>
  			<th>Appears in<br/>text of metadata</th>
***************
*** 59,133 ****
  		</tr>
  		<x:forEach var="inst" varStatus="i" select="$instXml/institutions/table/tr/td">
! 			<c:set var="instName"><x:out select="$inst/p/a/b"/></c:set>
! 			<%
! 				try {
! 					String instName = (String) pageContext.getAttribute("instName");
! 					instName = instName.replaceAll("\\s+", " ");
! 					
! 					ResultDoc[] resultDocs = null;
! 					SimpleLuceneIndex index = (SimpleLuceneIndex) application.getAttribute("index");
! 					
! 					String query = null;
! 					
! 					query = "itemContent:(\"" + instName + "\")";
! 					resultDocs = index.searchDocs(query);
! 					pageContext.setAttribute("numContent", (resultDocs == null ? 0 : resultDocs.length) );
! 					pageContext.setAttribute("numContentQuery", query );
! 					
! 					query = "organizationInstName:(\"" + instName + "\")";
! 					resultDocs = index.searchDocs(query);
! 					pageContext.setAttribute("numInst", (resultDocs == null ? 0 : resultDocs.length) );
! 					pageContext.setAttribute("numInstQuery", query );
! 
! 					query = "(\"" + instName + "\")";
! 					resultDocs = index.searchDocs(query);
! 					pageContext.setAttribute("numMetadata", (resultDocs == null ? 0 : resultDocs.length) );
! 					pageContext.setAttribute("numMetadataQuery", query );
! 					
! 					query = "(\"" + instName + "\") OR itemContent:(\"" + instName + "\") OR organizationInstName:(\"" + instName + "\")";
! 					resultDocs = index.searchDocs(query);
! 					pageContext.setAttribute("numAnywhere", (resultDocs == null ? 0 : resultDocs.length) );
! 					pageContext.setAttribute("numAnywhereQuery", query );						
! 					
! 				} catch ( Throwable t ) {
! 					System.out.println("Error: " + t );
! 					t.printStackTrace();
! 				
! 				}
! 			%>
! 			<tr>
! 				<td style="text-align: left; text-transform: capitalize">
! 					${i.count} ${instName} 
! 					<%-- <ul>
! 						<x:forEach var="dept" varStatus="j" select="$inst//ul//li/a">
! 							<li><x:out select="$dept"/></li>
! 						</x:forEach>
! 					</ul> --%>
! 				</td>
! 				<td>
! 					<c:url var="qUrl" value='/admin/query.do'>
! 						<c:param name="q">${numInstQuery}</c:param>
! 					</c:url>
! 					<a href="${qUrl}">${numInst}</a>
! 				</td>
! 				<td>
! 					<c:url var="qUrl" value='/admin/query.do'>
! 						<c:param name="q">${numMetadataQuery}</c:param>
! 					</c:url>				
! 					<a href="${qUrl}">${numMetadata}</a>
! 				</td>
! 				<td>
! 					<c:url var="qUrl" value='/admin/query.do'>
! 						<c:param name="q">${numContentQuery}</c:param>
! 					</c:url>			
! 					<a href="${qUrl}">${numContent}</a>
! 				</td>
! 				<td>
! 					<c:url var="qUrl" value='/admin/query.do'>
! 						<c:param name="q">${numAnywhereQuery}</c:param>
! 					</c:url>					
! 					<a href="${qUrl}">${numAnywhere}</a>
! 				</td>				
! 			</tr>
  		</x:forEach>		
  	</table>
--- 51,136 ----
  		</tr>
  		<x:forEach var="inst" varStatus="i" select="$instXml/institutions/table/tr/td">
! 			<x:choose>
! 				<x:when select="$inst[@type='headRow']">
! 					<c:set var="instCount" value="0"/>
! 					<th colspan="6"><x:out select="$inst"/></th>
! 				</x:when>
! 				<x:otherwise>
! 					<c:set var="instName"><x:out select="$inst/p/a/b|$inst/p/b/a"/></c:set>
! 					<%
! 						try {
! 							String instName = (String) pageContext.getAttribute("instName");
! 							instName = instName.replaceAll("\\s+", " ");
! 							
! 							ResultDoc[] resultDocs = null;
! 							SimpleLuceneIndex index = (SimpleLuceneIndex) application.getAttribute("index");
! 							
! 							String query = null;
! 							
! 							query = "itemContent:(\"" + instName + "\")";
! 							resultDocs = index.searchDocs(query);
! 							pageContext.setAttribute("numContent", (resultDocs == null ? 0 : resultDocs.length) );
! 							pageContext.setAttribute("numContentQuery", query );
! 							
! 							query = "organizationInstName:(\"" + instName + "\")";
! 							resultDocs = index.searchDocs(query);
! 							pageContext.setAttribute("numInst", (resultDocs == null ? 0 : resultDocs.length) );
! 							pageContext.setAttribute("numInstQuery", query );
! 		
! 							query = "(\"" + instName + "\")";
! 							resultDocs = index.searchDocs(query);
! 							pageContext.setAttribute("numMetadata", (resultDocs == null ? 0 : resultDocs.length) );
! 							pageContext.setAttribute("numMetadataQuery", query );
! 							
! 							query = "(\"" + instName + "\") OR itemContent:(\"" + instName + "\") OR organizationInstName:(\"" + instName + "\")";
! 							resultDocs = index.searchDocs(query);
! 							pageContext.setAttribute("numAnywhere", (resultDocs == null ? 0 : resultDocs.length) );
! 							pageContext.setAttribute("numAnywhereQuery", query );						
! 							
! 						} catch ( Throwable t ) {
! 							System.out.println("Error: " + t );
! 							t.printStackTrace();
! 						}
! 					%>
! 					<tr>
! 						<td style="text-align: left;">
! 							<c:set var="instCount">${instCount+1}</c:set>
! 							${instCount}
! 						</td>						
! 						<td style="text-align: left; text-transform: capitalize">
! 							${instName} 
! 							<%-- <ul>
! 								<x:forEach var="dept" varStatus="j" select="$inst//ul//li/a">
! 									<li><x:out select="$dept"/></li>
! 								</x:forEach>
! 							</ul> --%>
! 						</td>
! 						<td>
! 							<c:url var="qUrl" value='/admin/query.do'>
! 								<c:param name="q">${numInstQuery}</c:param>
! 							</c:url>
! 							<a href="${qUrl}">${numInst}</a>
! 						</td>
! 						<td>
! 							<c:url var="qUrl" value='/admin/query.do'>
! 								<c:param name="q">${numMetadataQuery}</c:param>
! 							</c:url>				
! 							<a href="${qUrl}">${numMetadata}</a>
! 						</td>
! 						<td>
! 							<c:url var="qUrl" value='/admin/query.do'>
! 								<c:param name="q">${numContentQuery}</c:param>
! 							</c:url>			
! 							<a href="${qUrl}">${numContent}</a>
! 						</td>
! 						<td>
! 							<c:url var="qUrl" value='/admin/query.do'>
! 								<c:param name="q">${numAnywhereQuery}</c:param>
! 							</c:url>					
! 							<a href="${qUrl}">${numAnywhere}</a>
! 						</td>				
! 					</tr>
! 				</x:otherwise>
! 			</x:choose>
  		</x:forEach>		
  	</table>

Index: ucar-member-institutions.xml
===================================================================
RCS file: /cvsroot/dlese/dds-project/web/admin/reporting/ucar-member-institutions.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ucar-member-institutions.xml	31 Jan 2007 02:22:34 -0000	1.1
--- ucar-member-institutions.xml	31 Jan 2007 18:38:15 -0000	1.2
***************
*** 1,4 ****
--- 1,13 ----
  <institutions>
        <table>
+ 	  
+ 	  
+ 		<!-- ===================== Member Universities ===================== -->
+ 	<tr>
+ 		<td type="headRow">
+ 			Member Universities
+ 		</td>
+ 	</tr>
+ 	
          <tr> 
            <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.uah.edu/"><b>university 
***************
*** 499,503 ****
            </ul></td>
            <td valign="top"><p class="subnav-bg-main"><a href="http://www.tamu.edu/"><b>texas
!             a &amp; m university</b></a></p>
              <ul>
                <li><a href="http://geosciences.tamu.edu/">college of geosciences </a></li>
--- 508,512 ----
            </ul></td>
            <td valign="top"><p class="subnav-bg-main"><a href="http://www.tamu.edu/"><b>texas
!             a m university</b></a></p>
              <ul>
                <li><a href="http://geosciences.tamu.edu/">college of geosciences </a></li>
***************
*** 614,617 ****
--- 623,998 ----
              </ul></td>
          </tr>
+ 		
+ 		
+ 		
+ 		
+ 		<!-- ===================== Academic Affiliate Universities ===================== -->
+ 	<tr>
+ 		<td type="headRow">
+ 			Academic Affiliate Universities
+ 		</td>
+ 	</tr>		
+ 		
+ 			  <tr> 
+ 				<td width="50%" ><p align="left" class="subnav-bg-main"><a href="http://www.cau.edu"><b>clark
+ 						atlanta university</b></a>
+ 				  </p>
+ 				</td>
+ 				<td width="50%" ><p align="left" class="subnav-bg-main"><a href="http://www.cofc.edu/"><b>college  
+ 					of charleston</b></a></p></td>
+ 	
+ 			  </tr>
+ 			  <tr> 
+ 				<td width="50%" > <p align="left" class="subnav-bg-main"><a
+ 		  href="http://www.jsums.edu/"><b>jackson state university</b></a></p>
+ 				</td>
+ 				<td width="50%" ><p align="left" class="subnav-bg-main"><a href="http://www.fit.edu/"><b>florida
+ 				institute of technology</b></a></p></td>
+ 			  </tr>
+ 			  <tr>
+ 				<td ><p class="subnav-bg-main"><a href="http://www.nlu.edu"><b>university
+ 				of louisiana at monroe</b></a></p></td>
+ 	
+ 				<td > <p align="left" class="subnav-bg-main"><a href="http://www.ku.edu"><b>university
+ 						of kansas</b></a> </p>
+ 				  <ul>
+ 					<li>
+ 					  <div align="left"><a
+ 		  href="http://www.geog.ku.edu/">department of geography </a></div>
+ 					</li>
+ 				</ul>              </td>
+ 	
+ 			  </tr>
+ 			  <tr> 
+ 				<td width="50%" ><p align="left" class="subnav-bg-main"><a href="http://umet_mie.suagm.edu"><b>universidad
+ 						metropolitana</b></a></p>
+ 				  </td>
+ 				<td width="50%" ><p align="left" class="subnav-bg-main"><a href="http://www.lsc.vsc.edu/"><b>lyndon
+ 						state college</b></a></p>
+ 				  </td>
+ 			  </tr>
+ 			  <tr> 
+ 				<td width="50%" > <p align="left" class="subnav-bg-main"><a href="http://www.brockport.edu"><b>state
+ 						university of new york at brockport</b></a> </p>
+ 	
+ 				  <ul>
+ 					<li>
+ 					  <div align="left"><a
+ 		  href="http://www.weather.brockport.edu">department of the earth sciences</a></div>
+ 					</li>
+ 				</ul></td>
+ 				<td width="50%" ><p align="left" class="subnav-bg-main"><a href="http://muweb.millersville.edu/index.php"><b>millersville
+ 						university</b></a></p>
+ 				  <ul>
+ 					<li>
+ 	
+ 					  <div align="left"><a href="http://muweb.millersville.edu/%7eesci/">department
+ 						  of earth sciences</a></div>
+ 					</li>
+ 					<li>
+ 					  <div align="left"><a
+ 		  href="http://www.atmos.millersville.edu/">meteorology program</a></div>
+ 					</li>
+ 				</ul></td>
+ 			  </tr>
+ 			  <tr> 
+ 				<td width="50%" > <p align="left" class="subnav-bg-main"><a href="http://www.plymouth.edu"><b>plymouth
+ 						state university</b></a> </p>
+ 	
+ 				  <ul>
+ 					<li>
+ 					  <div align="left"><a href="http://vortex.plymouth.edu">weather
+ 						  center</a></div>
+ 					</li>
+ 					<li>
+ 					  <div align="left"><a
+ 		  href="http://vortex.plymouth.edu/page1.html">meteorology program</a></div>
+ 					</li>
+ 				  </ul></td>
+ 	
+ 				<td width="50%" ><p align="left" class="subnav-bg-main"><a href="http://www.und.nodak.edu"><b>university
+ 						of north dakota</b></a> </p>
+ 				  <ul>
+ 					<li>
+ 					  <div align="left"><a
+ 		  href="http://www.atmos.und.edu/">department of atmospheric
+ 						  sciences</a></div>
+ 					</li>
+ 					<li>
+ 					  <div align="left"><a
+ 		  href="http://www.eerc.und.nodak.edu">energy and the environment research
+ 						  center</a></div>
+ 	
+ 					</li>
+ 				  </ul></td>
+ 			  </tr>
+ 			  <tr> 
+ 				<td width="50%" > <p align="left" class="subnav-bg-main"><a href="http://www.sfsu.edu"><b>san
+ 						francisco state university</b></a> </p>
+ 				  <ul>
+ 					<li>
+ 					  <div align="left"><a
+ 		  href="http://tornado.sfsu.edu/">department of geosciences</a></div>
+ 	
+ 					</li>
+ 				  </ul></td>
+ 				<td width="50%" > <p align="left" class="subnav-bg-main"><a href="http://www.stcloudstate.edu"><b>saint
+ 						cloud state university</b></a></p>
+ 				  </td>
+ 			  </tr>
+ 			  <tr> 
+ 				<td width="50%" > <p align="left" class="subnav-bg-main"><a href="http://www.sdsmt.edu/"><b>south
+ 						dakota school of mines &amp; technology</b></a> </p>
+ 	
+ 				  <ul>
+ 					<li>
+ 					  <div align="left"><a href="http://www.ias.sdsmt.edu/index.htm">institute
+ 						  of atmospheric sciences</a></div>
+ 					</li>
+ 				  </ul></td>
+ 				<td width="50%" > <p align="left" class="subnav-bg-main"><a href="http://www.sjsu.edu/"><b>san
+ 						jose state university</b></a> </p>
+ 				  <ul>
+ 	
+ 					<li><a href="http://metsun1.sjsu.edu">meteorology department</a></li>
+ 				</ul></td>
+ 			  </tr>
+ 			  <tr> 
+ 				<td width="50%" > <p align="left" class="subnav-bg-main"><a href="http://www.nadn.navy.mil/"><b>united
+ 						states naval academy</b></a></p>
+ 				  <ul>
+ 					<li>
+ 	
+ 					  <div align="left"><a href="http://www.nadn.navy.mil:80/oceanography/">department
+ 						  of oceanography</a><a href="http://www.ias.sdsmt.edu/index.htm"></a></div>
+ 					</li>
+ 				  </ul></td>
+ 			  </tr>
+ 			  
+ 			  
+ 			  
+ 	
+ 			  
+ 			  
+ 			  <!-- ===================== International Affiliate Institutions ===================== -->
+ 	<tr>
+ 		<td type="headRow">
+ 			International Affiliate Institutions
+ 		</td>
+ 	</tr>
+ 			 
+      <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://online.anu.edu.au/">australian 
+               national university
+               </a></b></p><span class="sidebar"><b>canberra</b></span> </td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.tor.ec.gc.ca/"><b>atmospheric 
+               environment service
+ 
+               </b></a></p><span class="sidebar"><b>downsview, ontario, canada</b></span> 
+           </td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.bom.gov.au/bmrc/"><b>bureau 
+               of meteorology research centre</b></a><b>
+               <span class="sidebar">melbourne, australia</span></b></p></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.cwb.gov.tw/v5e/index.htm"><b>central 
+               weather bureau
+ 
+               </b></a></p><span class="sidebar"><b>taipei</b></span></td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://serpiente.dgsca.unam.mx/cca/"><b>centro 
+               de ciencias de la atmosfera
+               </b></a></p><span class="sidebar"><b>mexico</b></span></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.cathalac.org/"><b>centro 
+               del agua del tropico humedo para america latina 
+               y el caribe</b></a></p><b>
+ 
+               <span class="sidebar">panama</span></b></td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.cityu.edu.hk/"><b>city 
+               university of hong kong</b></a></p></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.dlr.de/"><b>deutsche 
+               forschungsanstalt fur luft und raumfahrt</b></a></p><b>
+               <span class="sidebar">oberpfaffenhofen, germany</span></b></td>
+ 
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://kfa-juelich.de/"><b>forschungszentrum 
+               julich gmbh</b></a></p><b>
+               <span class="sidebar">julich, germany</span> </b> </td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.futa.edu.ng/"><b>federal 
+               university of technology</b></a></p><b>
+ 
+               <span class="sidebar">akure, nigeria</span></b></td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.weather.gov.hk/contente.htm/">hong 
+               kong observatory</a></b></p></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.ust.hk/">hong 
+               kong university of science and technology</a></b></p></td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.iac.es/"><b>instituto 
+               de astrofisica de canarias</b></a></p><b>
+ 
+               <span class="sidebar">tenerife, spain</span></b></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.iap.ac.cn/"><b>institute 
+               of atmospheric physics, chinese academy of sciences</b></a></p><b>
+               <span class="sidebar">beijing</span></b></td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.imaa.cnr.it/"><b>istituto 
+               di metodologie per l'analisi ambientale (imaa) of the national research 
+               council (cnr)</b></a></p><b>
+ 
+               <span class="sidebar">italy</span> </b></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.inpe.br/"><b>instituto 
+               nacional de pesquisas espaciais (inpe)</b></a></p><b>
+               <span class="sidebar">sao jose dos campos, brazil</span></b></td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.misu.su.se/">international 
+               meteorological institute</a>
+ 
+               <span class="sidebar">stockholm, sweden</span></b></p></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.igp.gob.pe/igp.html">instituto 
+               geofisico del peru</a>
+               <span class="sidebar">lima</span></b></p></td> 
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.inm.es/">instituto 
+               nacional de meteorologia</a>
+ 
+               <span class="sidebar">madrid, spain</span></b></p></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.uni-mainz.de/fb/physik/ipa//">johannes 
+               gutenberg-universitat</a>
+               <span class="sidebar">mainz, germany</span></b></p></td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.kma.go.kr/kmas/kma/english/main.html">korea 
+               meteorological administration
+ 
+               </a><span class="sidebar">seoul</span> </b></p></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a>lanzhou institute 
+               of plateau atmospheric physics
+               </a><span class="sidebar">lanzhou, china</span></b></p></td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.mq.edu.au/">macquarie 
+               university</a>
+ 
+               <span class="sidebar">north ryde, australia</span></b></p></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.kjc.gov.my/main_e.html">malaysian 
+               meteorological service</a>
+               <span class="sidebar">kuala lumpur</span></b></p></td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.observatory.ph/csd/html/about.htm">manila 
+               observatory</a>
+ 
+               <span class="sidebar">philippines</span> </b></p></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.mpg.de/">max
+                   planck institute for meteorology</a>
+               <span class="sidebar">hamburg, germany</span></b></p></td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.mri-jma.go.jp/welcome.html">meteorological 
+               research institute</a>
+ 
+               <span class="sidebar">ibaraki, japan</span> </b></p></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.gencat.es/servmet/index.htm">meteorological 
+               service of catalonia</a>
+               <span class="sidebar">barcelona, spain</span> </b></p></td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.monash.edu.au/">monash 
+               university</a>
+ 
+               <span class="sidebar">clayton, australia</span></b></p></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.ncu.edu.tw/">national 
+               central university</a>
+               <span class="sidebar"> chung-li, taiwan</span></b></p></td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.ncmrwf.gov.in/">national 
+               centre for medium range forecasting</a>
+ 
+               <span class="sidebar">new delhi, india</span> </b></p></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.ntu.edu.tw/">national 
+               taiwan university</a>
+               <span class="sidebar">taipei</span></b></p></td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.pku.edu.cn/">peking 
+               university</a>
+ 
+               <span class="sidebar">beijing, china</span></b></p></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.risoe.dk/risoe.html">riso 
+               national laboratory</a>
+               <span class="sidebar">roskilde, denmark</span></b></p></td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.ac.msk.su/">russian 
+               academy of sciences</a>
+ 
+               <span class="sidebar">moscow</span></b></p></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.snu.ac.kr/">seoul 
+               national university</a>
+               <span class="sidebar">korea</span></b></p></td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://eng.rshu.ru/university_history.asp">state 
+               hydrometeorological university of the russian federation</a>
+ 
+               <span class="sidebar">st. petersburg</span> </b></p></td>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.tau.ac.il/">tel 
+               aviv university</a>
+               <span class="sidebar">israel</span></b></p></td>
+         </tr>
+         <tr> 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.uba.ar/homepage.html">universidad 
+               de buenos aires</a>
+ 
+               <span class="sidebar">argentina</span> </b></p></td>
+ 
+ <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.ucm.es/">universidad complutense de madrid </a>
+               <span class="sidebar">spain</span></b></p></td>
+         </tr>
+         <tr> 
+ 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.univaq.it/">universita 
+               degli studi dell'aquila</a>
+ 
+               <span class="sidebar">italy</span></b></p></td>
+       
+ 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.uni-hamburg.de/">universitat 
+               hamburg</a>
+               <span class="sidebar">germany</span></b></p></td>
+ </tr>
+         <tr>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.rrz.uni-koeln.de/">universitat 
+               koln</a>
+ 
+               <span class="sidebar">germany</span></b></p></td>
+  
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.man.ac.uk/">university 
+               of manchester</a>
+               <span class="sidebar">england</span></b></p></td>
+ </tr>
+         <tr>
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.uonbi.ac.ke/">university 
+               of nairobi</a>
+ 
+               <span class="sidebar">kenya</span></b></p></td>
+         
+ 
+           <td width="50%" valign="top"> <p class="subnav-bg-main"><b><a href="http://www.u-tokyo.ac.jp/">university 
+               of tokyo</a>
+               <span class="sidebar">japan</span> </b></p></td>
+         </tr>			  
        </table>
+ 	  
  </institutions>

[Dlese-dds-project] CVS: dds-project/web/admin/reporting ucar-member-institutions-report.jsp, NONE, 1.1 ucar-member-institutions.xml, NONE, 1.1 index_page.jsp, 1.10, 1.11

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

Update of /cvsroot/dlese/dds-project/web/admin/reporting
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv24697/web/admin/reporting

Modified Files:
	index_page.jsp 
Added Files:
	ucar-member-institutions-report.jsp 
	ucar-member-institutions.xml 
Log Message:
added report that counts the number of records associated with UCAR member institutions

--- NEW FILE ---
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ page language="java" %>
<%@ page import="org.dlese.dpc.repository.*" %>
<%@ page import="org.dlese.dpc.index.*" %>



<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
<%@ taglib uri="/WEB-INF/tlds/response.tld" prefix="resp" %>
<%@ taglib uri="/WEB-INF/tlds/request.tld" prefix="req" %>
<%@ taglib uri="/WEB-INF/tlds/datetime.tld" prefix="dt" %>
<%@ taglib uri='/WEB-INF/tlds/utils.tld' prefix='util' %>
<%@ include file="../../JSTLTagLibIncludes.jsp" %>

<html>
<head>
<title>UCAR Member Institution Record Count Report</title>
<link rel='stylesheet' type='text/css' href='../dlese_admin_styles.css'>

<style type="text/css">
	table{ 
		background-color:#f1f1f1;
	}
	th { 
		text-align: center;
		font-size: 10pt;
		font-weight: bold;
	}
	td { 
		text-align: center;
		font-size: 10pt;
	}	
	BODY{
		padding-left:15px;
		padding-top:15px;
	}	
</style>

</head>
<body>
	
	<h1>UCAR Member Institution Record Count Report</h1>
	<p>Date generated: <%= new java.util.Date().toString() %></p>

	<x:parse var="instXml">
		<c:import url="ucar-member-institutions.xml" charEncoding="UTF-8" />
	</x:parse>
	
	<table border=1 cellpadding=4 cellspacing=0>		
		<tr>
			<th>Institution Name</th>
			<th>Appears in<br/>organization field</th>
			<th>Appears in<br/>text of metadata</th>
			<th>Appears in<br/>site content</th>
			<th>Appears<br/>anywhere</th>							
		</tr>
		<x:forEach var="inst" varStatus="i" select="$instXml/institutions/table/tr/td">
			<c:set var="instName"><x:out select="$inst/p/a/b"/></c:set>
			<%
				try {
					String instName = (String) pageContext.getAttribute("instName");
					instName = instName.replaceAll("\\s+", " ");
					
					ResultDoc[] resultDocs = null;
					SimpleLuceneIndex index = (SimpleLuceneIndex) application.getAttribute("index");
					
					String query = null;
					
					query = "itemContent:(\"" + instName + "\")";
					resultDocs = index.searchDocs(query);
					pageContext.setAttribute("numContent", (resultDocs == null ? 0 : resultDocs.length) );
					pageContext.setAttribute("numContentQuery", query );
					
					query = "organizationInstName:(\"" + instName + "\")";
					resultDocs = index.searchDocs(query);
					pageContext.setAttribute("numInst", (resultDocs == null ? 0 : resultDocs.length) );
					pageContext.setAttribute("numInstQuery", query );

					query = "(\"" + instName + "\")";
					resultDocs = index.searchDocs(query);
					pageContext.setAttribute("numMetadata", (resultDocs == null ? 0 : resultDocs.length) );
					pageContext.setAttribute("numMetadataQuery", query );
					
					query = "(\"" + instName + "\") OR itemContent:(\"" + instName + "\") OR organizationInstName:(\"" + instName + "\")";
					resultDocs = index.searchDocs(query);
					pageContext.setAttribute("numAnywhere", (resultDocs == null ? 0 : resultDocs.length) );
					pageContext.setAttribute("numAnywhereQuery", query );						
					
				} catch ( Throwable t ) {
					System.out.println("Error: " + t );
					t.printStackTrace();
				
				}
			%>
			<tr>
				<td style="text-align: left; text-transform: capitalize">
					${i.count} ${instName} 
					<%-- <ul>
						<x:forEach var="dept" varStatus="j" select="$inst//ul//li/a">
							<li><x:out select="$dept"/></li>
						</x:forEach>
					</ul> --%>
				</td>
				<td>
					<c:url var="qUrl" value='/admin/query.do'>
						<c:param name="q">${numInstQuery}</c:param>
					</c:url>
					<a href="${qUrl}">${numInst}</a>
				</td>
				<td>
					<c:url var="qUrl" value='/admin/query.do'>
						<c:param name="q">${numMetadataQuery}</c:param>
					</c:url>				
					<a href="${qUrl}">${numMetadata}</a>
				</td>
				<td>
					<c:url var="qUrl" value='/admin/query.do'>
						<c:param name="q">${numContentQuery}</c:param>
					</c:url>			
					<a href="${qUrl}">${numContent}</a>
				</td>
				<td>
					<c:url var="qUrl" value='/admin/query.do'>
						<c:param name="q">${numAnywhereQuery}</c:param>
					</c:url>					
					<a href="${qUrl}">${numAnywhere}</a>
				</td>				
			</tr>
		</x:forEach>		
	</table>
	
	<br/><br/><br/>
		
</body>
</html>


--- NEW FILE ---
<institutions>
      <table>
        <tr> 
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.uah.edu/"><b>university 
              of alabama in huntsville</b></a></p>

            <ul>
              <li><a href="http://vortex.atmos.uah.edu/">the national space science 
                and technology center</a></li>
              <li><a href="http://www.nsstc.uah.edu/atmos/index.html">atmospheric 
                science department</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.alaska.edu/"><b>university 
              of alaska</b></a></p>
            <ul>
              <li><a href="http://www.arsc.edu/">arctic region supercomputing</a></li>

              <li> <a href="http://www.gi.alaska.edu/atmossci/">atmospheric sciences program</a> </li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"><p align="left" class="subnav-bg-main"><a href="http://www.albany.edu/"><b>university 
              at albany, state university of new york</b></a></p>
            <ul>
              <li><a href="http://www.atmos.albany.edu/das.html">department of 
                earth and atmospheric sciences</a></li>

            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.arizona.edu/"><b>university 
              of arizona</b></a></p>
            <ul>
              <li><a href="http://www.geo.arizona.edu/">department of geosciences</a></li>
              <li><a href="http://www.atmo.arizona.edu/">department of atmospheric 
                sciences</a></li>
            </ul></td>
        </tr>

        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.asu.edu/"><b>arizona 
              state university</b> </a></p>
            <ul>
              <li><a href="http://www.eas.asu.edu/">college of engineering and 
                applied sciences </a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.caltech.edu/"><b>california 
              institute of technology</b></a></p>
            <ul>

              <li><a href="http://www.gps.caltech.edu/">division of geological 
                and planetary sciences</a></li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.berkeley.edu/"><b>university 
              of california, berkeley</b></a></p>
            <ul>
              <li><a href="http://www.atmos.berkeley.edu/">berkeley atmospheric 
                sciences center </a></li>
            </ul></td>

          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.ucdavis.edu/"><b>university 
              of california, davis</b></a> </p>
            <ul>
              <li><a href="http://atm.ucdavis.edu/">atmospheric science department</a></li>
              <li><a href="http://lawr.ucdavis.edu/">department of land, air and 
                water resources</a></li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.uci.edu/"><b>university 
              of california, irvine</b></a> </p>

            <ul>
              <li><a href="http://www.physsci.uci.edu/">school of physical sciences</a></li>
              <li><a href="http://www.ess.uci.edu/">earth systems science department</a>              </li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.ucla.edu/"><b>university 
              of california, los angeles</b></a></p>
            <ul>
              <li><a href="http://www.atmos.ucla.edu/">department of atmospheric 
                sciences</a></li>

            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.uchicago.edu/"><b>university 
              of chicago</b></a> </p>
            <ul>
              <li><a href="http://geosci.uchicago.edu/">department of geophysical 
                sciences</a></li>
              <li><a href="http://physical-sciences.uchicago.edu/">physical sciences 
                division</a></li>

            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.colostate.edu/"><b>colorado 
              state university</b></a></p>
            <ul>
              <li><a href="http://www.atmos.colostate.edu/">department of atmospheric 
                science</a></li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.colorado.edu/"><b>university 
              of colorado at boulder</b></a> </p>

            <ul>
              <li><a href="http://cires.colorado.edu/">cooperative institute for 
                research in environmental sciences</a></li>
              <li><a href="http://lasp.colorado.edu/">laboratory for atmospheric 
                and space physics</a></li>
              <li><a href="http://paos.colorado.edu/">program in atmospheric and 
                oceanic sciences</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.columbia.edu/"><b>columbia 
              university</b></a></p>
            <ul>

              <li><a href="http://www.apam.columbia.edu">department of applied 
                physics and applied mathematics</a></li>
              <li><a href="http://www.ldeo.columbia.edu/">lamont-doherty earth 
                observatory</a></li>
              <li><a href="http://www.giss.nasa.gov">nasa goddard institute for 
                space studies</a></li>
            </ul>          </td>
        </tr>
        <tr> 
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.cornell.edu/"><b>cornell 
              university</b></a> </p>

            <ul>
              <li><a href="http://www.eas.cornell.edu/">department 
                of earth and atmospheric sciences</a></li>
              <li><a href="http://www.eas.cornell.edu/fbxk/geolog.cfm">department 
                of geological sciences</a></li>
              <li><a href="http://www.eas.cornell.edu/fbxk/atmos.cfm#top">atmospheric 
                science program</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.du.edu/"><b>university 
              of denver</b></a></p>
            <ul>

              <li><a href="http://www.du.edu/geography/">department of geography</a></li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.drexel.edu/"><b>drexel 
              university</b></a></p>
            <ul>
              <li><a href="http://einstein.drexel.edu/">department of physics 
                and atmospheric science</a></li>

            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.fsu.edu/"><b>florida 
              state university</b></a></p>
            <ul>
              <li><a href="http://www.met.fsu.edu/">department of meteorology</a></li>
              <li><a href="http://ocean.fsu.edu/">department of oceanography</a></li>
            </ul></td>
        </tr>

        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.gatech.edu/"><b>georgia 
              institute of technology</b></a></p>
            <ul>
              <li><a href="http://www.eas.gatech.edu/">school of earth and atmospheric 
                sciences</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.harvard.edu/"><b>harvard 
              university</b></a><a href="http://www.harvard.edu/"><b></b></a></p>
            <ul>

              <li><a href="http://www-eps.harvard.edu/">department of earth and 
                planetary sciences</a> </li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.hawaii.edu/"><b>university 
              of hawaii</b></a></p>
            <ul>
              <li>uh-hilo: 
                <ul>

                  <li><a href="http://www.phys.uhh.hawaii.edu/">department of 
                    physics and astronomy</a></li>
                </ul>
              </li>
              <li>uh-manoa: 
                <ul>
                  <li><a href="http://www.soest.hawaii.edu:80/">school of ocean 
                    and earth science technology (soest)</a></li>
                  <li><a href="http://lumahai.soest.hawaii.edu/dept/meteorology/meteorology.html">department 
                    of meteorology</a></li>
                  <li><a href="http://www.soest.hawaii.edu/oceanography/">department 
                    of oceanography</a></li>

                  <li><a href="http://www.phys.hawaii.edu/">department of physics 
                    and astronomy</a></li>
                </ul>
              </li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.uh.edu/"><b>university
                  of houston </b></a></p>
            <ul>
              <li><a href="http://www.geosc.uh.edu/">department of geosciences </a></li>

            </ul></td>
        </tr>
        <tr>
          <td valign="top"><p class="subnav-bg-main"><a href="http://www.howard.edu/"><b>howard
                  university</b></a></p>
            <ul>
              <li><a href="http://www.physics1.howard.edu/">department of physics
                  and astronomy </a></li>
          </ul></td>
          <td valign="top"><p class="subnav-bg-main"><a href="http://www.uiuc.edu/"><b>university
                  of illinois at urbana-champaign</b></a></p>

            <ul>
              <li><a href="http://www.atmos.uiuc.edu/">department of atmospheric
                  sciences</a></li>
          </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.uiowa.edu/"><b>university
                  of iowa</b></a></p>
            <ul>
              <li><a href="http://www.cgrer.uiowa.edu/">center for global and
                  regional environmental research</a></li>

            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.iastate.edu/"><b>iowa
                  state university</b></a></p>
            <ul>
              <li><a href="http://www.ge-at.iastate.edu/">geological and atmospheric
                  sciences</a></li>
              <li><a href="http://www.physics.iastate.edu/welcome">department
                  of physics and astronomy</a></li>
            </ul></td>
        </tr>

        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.jhu.edu/"><b>the
                  johns hopkins university</b></a></p>
            <ul>
              <li><a href="http://www.jhu.edu/~eps">department of earth and planetary
                  sciences</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.umd.edu/"><b>university
                  of maryland</b></a></p>
            <ul>

              <li><a href="http://www.atmos.umd.edu/">department of atmospheric
                  and oceanic science </a></li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://web.mit.edu/"><b>massachusetts
                  institute of technology</b></a></p>
            <ul>
              <li><a href="http://web.mit.edu/cgcs/www/">center for global change
                  science</a></li>

              <li><a href="http://eapsweb.mit.edu/">department of earth, atmospheric
                  and planetary sciences</a></li>
              <li><a href="http://hyperion.haystack.edu/haystack/haystack.html">haystack
                  observatory</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.mcgill.ca/"><b>mcgill
                  university</b></a></p>
            <ul>
              <li><a href="http://ww2.mcgill.ca/ccgcr/">center for climate and
                  global change research</a></li>
              <li><a href="http://www.mcgill.ca/meteo/">department of atmospheric
                  and oceanic sciences</a></li>

            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.ir.miami.edu/"><b>university
                  of miami</b></a></p>
            <ul>
              <li><a href="http://www.rsmas.miami.edu/">rosenstiel school of
                  marine and atmospheric science</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.umich.edu/"><b>university
                  of michigan</b></a></p>

            <ul>
              <li><a href="http://aoss.engin.umich.edu/">department of atmospheric,
                  oceanic, and space sciences</a></li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.umn.edu/"><b>university
                  of minnesota</b></a></p>
            <ul>
              <li><a href="http://www.geo.umn.edu/">newton horace winchell school
                  of earth sciences</a></li>

              <li><a href="http://www.geog.umn.edu/">department of geography</a></li>
              <li><a href="http://www.soils.agri.umn.edu/">department of soil,
                  water and climate</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.umsystem.edu/"><b>university
                  of missouri</b></a></p>
            <ul>
              <li><a href="http://www.missouri.edu/index.cfm">university of missouri-columbia</a></li>
              <li><a href="http://solberg.snr.missouri.edu/">um, columbia atmospheric
                  science</a></li>

              <li><a href="http://www.umr.edu/">university of missouri-rolla</a></li>
              <li><a href="http://web.umr.edu/~acloud/">um, rolla cloud and aerosal
                  laboratory</a></li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.nps.edu/"><b>naval
                  postgraduate school</b></a></p>
            <ul>

              <li><a href="http://www.weather.nps.navy.mil/">department of meteorology</a></li>
              <li><a href="http://www.oc.nps.navy.mil/">department of oceanography</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.unl.edu/index.html"><b>university
                  of nebraska lincoln</b></a></p>
            <ul>
              <li> <a href="http://www.atmosci.unl.edu/">atmospheric sciences
                  at unl</a></li>

            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.nevada.edu/"><b>nevada
                  system of higher education </b></a></p>
            <ul>
              <li><a href="http://www.dri.edu/">desert research institute (dri)</a></li>
              <li><a href="http://www.das.dri.edu/">dri - division of atmospheric
                  sciences </a></li>

              <li><a href="http://www.dees.dri.edu/">dri - division of earth
                  and ecosystem sciences</a></li>
              <li><a href="http://wrcc.sage.dri.edu/">dri - western regional
                  climate center</a></li>
              <li><a href="http://www.dhs.dri.edu/">dri - division of hydrologic
                  sciences </a></li>
              <li><a href="http://www.unr.edu/">university of nevada, reno</a></li>
              <li><a href="http://www.unlv.edu/">university of nevada, las vegas</a></li>
            </ul></td>

          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.unh.edu/"><b>university
                  of new hampshire</b></a></p>
            <ul>
              <li><a href="http://www.eos.sr.unh.edu/">institute for the study
                  of earth, oceans, and space</a></li>
              <li><a href="http://www.physics.unh.edu/">department of physics</a></li>
              <li><a href="http://www.unh.edu/ur-esci.html">department of earth
                  sciences </a></li>
            </ul></td>
        </tr>

        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.nmt.edu/"><b>new
                  mexico institute of mining and technology</b></a></p>
            <ul>
              <li><a href="http://www.ees.nmt.edu/">department of earth and environmental
                  science </a></li>
              <li><a href="http://physics.nmt.edu/">department of physics</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.nyu.edu/"><b>new
                  york university</b></a></p>

            <ul>
              <li><a href="http://www.cims.nyu.edu/">courant institute of mathematical
                  sciences</a></li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.ncsu.edu/"><b>north
                  carolina state university</b></a></p>
            <ul>
              <li><a href="http://www.pams.ncsu.edu/">college of physical and
                  mathematical sciences</a></li>

              <li><a href="http://www.meas.ncsu.edu/">department of marine, earth
                  and atmospheric sciences</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.osu.edu/index.php"><b>the
                  ohio state university</b></a></p>
            <ul>
              <li><a href="http://asp1.sbs.ohio-state.edu/">atmospheric science
                  program</a></li>
              <li><a href="http://thoth.sbs.ohio-state.edu/">department of geography</a></li>
            </ul></td>

        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.ou.edu/"><b>university
                  of oklahoma</b></a></p>
            <ul>
              <li><a href="http://geosciences.ou.edu/index.php">college of geosciences</a></li>
              <li><a href="http://www.caps.ou.edu/">center for analysis and prediction
                  of storms (caps)</a></li>
              <li><a href="http://k12.ocs.ou.edu/">oklahoma climatological survey</a></li>

            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://web.odu.edu/"><b>old
                  dominion university</b></a></p>
            <ul>
              <li><a href="http://www.ccpo.odu.edu/">center for coastal physical
                  oceanography</a></li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.orst.edu/"><b>oregon
                  state university</b></a></p>

            <ul>
              <li><a href="http://www.oce.orst.edu/">college of oceanic and atmospheric
                  sciences</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.psu.edu/"><b>pennsylvania
                  state university</b></a></p>
            <ul>
              <li><a href="http://www.ems.psu.edu/">college of earth and mineral
                  sciences</a></li>
              <li><a href="http://www.met.psu.edu/">department of meteorology</a></li>

              <li><a href="http://www.ems.psu.edu/wx/">penn state weather page</a></li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.princeton.edu/"><b>princeton
                  university</b></a></p>
            <ul>
              <li><a href="http://www.aos.princeton.edu/">program in atmospheric
                  and oceanic sciences</a></li>

            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.purdue.edu/"><b>purdue
                  university</b></a></p>
            <ul>
              <li><a href="http://www.eas.purdue.edu/">department of earth and
                  atmospheric sciences</a></li>
              <li><a href="http://newcrop.hort.purdue.edu/ext/weather.html">weather
                  web sites </a></li>
            </ul></td>
        </tr>

        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.uri.edu/"><b>university
                  of rhode island</b></a></p>
            <ul>
              <li><a href="http://www.gso.uri.edu/">graduate school of oceanography</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.rice.edu/"><b>rice
                  university</b></a></p>
            <ul>

              <li><a href="http://www.physics.rice.edu/">department of physics
                  and astronomy</a></li>
              <li><a href="http://space.rice.edu/">rice space institute</a></li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.rutgers.edu/"><b>rutgers
                  university</b></a></p>
            <ul>

              <li><a href="http://www.marine.rutgers.edu/">institute of marine
                  and coastal sciences</a> </li>
              <li><a href="http://www.envsci.rutgers.edu/">department of environmental
                  sciences </a></li>
              <li><a href="http://www.cep.rutgers.edu/">center for environmental
                  prediction</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.slu.edu/"><b>saint
                  louis university</b></a></p>
            <ul>

              <li><a href="http://www.eas.slu.edu/">department of earth and atmospheric
                  sciences</a></li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://sio.ucsd.edu/"><b>scripps
                  institution of oceanography at ucsd</b></a></p>          </td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.stanford.edu/"><b>stanford
                  university</b></a></p>
            <ul>

              <li><a href="http://pangea.stanford.edu/">school of earth sciences</a></li>
          </ul></td>
        </tr>
        <tr>
          <td valign="top"><p class="subnav-bg-main"><a href="http://www.sunysb.edu/"><b>stony brook university, state university of new york </b></a></p>
            <ul>
              <li><a href="http://geophysics.geo.sunysb.edu/">department of geosciences </a></li>

          </ul></td>
          <td valign="top"><p class="subnav-bg-main"><a href="http://www.tamu.edu/"><b>texas
            a &amp; m university</b></a></p>
            <ul>
              <li><a href="http://geosciences.tamu.edu/">college of geosciences </a></li>
          </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.utexas.edu/"><b>university
                  of texas at austin</b></a></p>            
            <ul>

              <li><a href="http://www.csr.utexas.edu/">center for space research</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.ttu.edu/"><b>texas
                  tech university</b></a></p>            
            <ul>
              <li><a href="http://www.ttu.edu:80/~geosc/">department of geosciences</a></li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.utoronto.ca/"><b>university
                  of toronto</b></a></p>            
            <ul>

              <li><a href="http://www.atmosp.physics.utoronto.ca/">atmospheric physics</a></li>
              <li><a href="http://www.chem.utoronto.ca/research/environmental.php">department of chemistry</a></li>
              <li> <a href="http://www.geology.utoronto.ca/">department of geology</a> </li>
              <li> <a href="http://www.geog.utoronto.ca/">department of geography</a></li>
            </ul></td>

          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.usu.edu/"><b>utah
                  state university</b></a></p>              
            <ul>
              <li><a href="http://www.physics.usu.edu/">department of physics</a></li>
              <li><a href="http://www.nr.usu.edu/geography-department/gerdinf.html">department
                of geography and earth resources </a></li>
          </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.utah.edu/"><b>university
                  of utah</b></a></p>            
            <ul>

              <li><a href="http://www.met.utah.edu/homepage.html">department
                of meteorology</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://gwis.virginia.edu/"><b>university
                  of virginia</b></a></p>            
            <ul>
              <li><a href="http://www.evsc.virginia.edu/">department of environmental
                sciences</a></li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.washington.edu/"><b>university
                  of washington</b></a></p>            
            <ul>

              <li><a href="http://www.atmos.washington.edu/">department of atmospheric
                sciences</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.wsu.edu/"><b>washington
                  state university</b></a></p>            
            <ul>
              <li><a href="http://www.ce.wsu.edu/">department of civil and environmental
                engineering </a></li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.wisc.edu/"><b>university
                  of wisconsin- madison</b></a></p>            
            <ul>

              <li><a href="http://www.meteor.wisc.edu/">department of atmospheric
                and oceanic sciences</a></li>
              <li><a href="http://www.geography.wisc.edu/">department of geography</a></li>
              <li><a href="http://www.geology.wisc.edu/home.html">department
                of geology and geophysics</a></li>
              <li><a href="http://mocha.meteor.wisc.edu/">nonhydrostatic modeling
                system</a></li>
            </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.uwm.edu/"><b>university
                  of wisconsin-milwaukee</b></a></p>            
            <ul>

              <li><a href="http://www.uwm.edu/dept/geosciences">department of
                geosciences</a></li>
            </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.whoi.edu/index.html"><b>woods
            hole oceanographic institution</b></a></p>            </td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.uwyo.edu/"><b>university
                  of wyoming</b></a></p>          
            <ul>

              <li><a href="http://www-das.uwyo.edu/">department of atmospheric
                science</a></li>
          </ul></td>
        </tr>
        <tr> 
          <td width="50%" valign="top"> <p class="subnav-bg-main"><a href="http://www.yale.edu/"><b>yale
                  university</b></a></p>          
            <ul>
              <li><a href="http://www.geology.yale.edu/">department of geology
                and geophysics </a></li>
              <li><a href="http://www.yale.edu/ceo/">center for earth observation </a></li>

          </ul></td>
          <td width="50%" valign="top"><p class="subnav-bg-main"><a href="http://www.yorku.ca/"><b>york
                  university</b></a></p>            
            <ul>
              <li><a href="http://www.cress.yorku.ca/grad/">programme in earth
                and space science</a></li>
            </ul></td>
        </tr>
      </table>
</institutions>

Index: index_page.jsp
===================================================================
RCS file: /cvsroot/dlese/dds-project/web/admin/reporting/index_page.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** index_page.jsp	21 Sep 2005 23:24:20 -0000	1.10
--- index_page.jsp	31 Jan 2007 02:22:34 -0000	1.11
***************
*** 1,140 ****
! <%@ page contentType="text/html; charset=UTF-8" %>
! <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
! <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
! <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
! <%@ taglib uri="/WEB-INF/tlds/taglibs-application.tld" prefix="app" %>
! <%@ taglib uri='/WEB-INF/tlds/response.tld' prefix='res' %>
! 
! <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
! <%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
! <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
! <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
! <%@ page isELIgnored ="false" %>
! 
! <c:set var="indexLabel">
! 	<c:choose>
! 		<c:when test="${drf.indexToUse == 'webLogIndex'}">
! 			Web log
! 		</c:when>
! 		<c:otherwise>
! 			DDS
! 		</c:otherwise>	
! 	</c:choose>
! </c:set>
! 
! <html:html>
! 
! <!-- $Id$ -->
! 
! <head>
! <title>DDS reporting</title>
! <link rel='stylesheet' type='text/css' href='../dlese_admin_styles.css'>
! 
! <script language="javascript">
! <!--
! 	function useIndex(newIndex){
! 		indexToUse = newIndex.options[newIndex.selectedIndex].value;
! 		
! 		if(indexToUse != ""){
! 			window.location.href = "report.do?indexToUse=" + indexToUse;
! 		}
! 	}
! 
! -->
! </script>
! 
! </head>
! <body onLoad="JavaScript: document.fieldForm.fields.focus()"> 
! <div style="padding-left:15px">
! 	
! 	<p><a href="../admin.do">Back to the Collection Manager</a></p> 
! 
! 	<h1>Term count reports</h1>
! 	
! 
! 	
! 	<p>
! 	<div style="padding-bottom:3px">
! 	Show reports for the following index:
! 	</div>
! 	<html:form action="admin/reporting/report">
! 		<html:select property="indexToUse" value="${drf.indexToUse}" onchange="JavaScript:useIndex(this.form.indexToUse)">
! 			<html:option value="ddsIndex">DDS index</html:option>
! 			<html:option value="webLogIndex">Web log index</html:option>
! 		</html:select>	
! 	</html:form>
! 	</p>
! 	
! 
! 	<h2>Fields in the ${indexLabel} index</h2>
! 	<p>This report shows a <a href="report.do?verb=ListFields&indexToUse=${drf.indexToUse}" title="Click to view the list of fields">list of all fields in the ${indexLabel} index</a>.</p>	
! 
! 	
! 	<h2>Term count reports for the ${indexLabel} index:</h2>
! 	<p>These reports show the terms that exist in the ${indexLabel} index within a given field or
! 	fields. A total term count, total number of documents in which the term appears and 
! 	list of fields in which the term appears
! 	is provided.</p>
! 	
! 	Enter a field or list of fields separated by space below *:
! 	
! 	<form method="GET" action="report.do" name="fieldForm">
! 		<input type="text" name="fields" size="30" value="">
! 		<input type="hidden" name="verb" value="TermCount">
! 		<input type="hidden" name="indexToUse" value="${drf.indexToUse}">
! 		<input type="submit" value="Show report">
! 		<br>* Note that if more than one field is requested the report will take considerably longer to generate.				
! 	</form>		
! 	
! 	<c:if test="${drf.indexToUse == 'ddsIndex'}">
! 		<p>
! 		Or use one of these pre-defined links:
! 		<div style="padding-top:4px">
! 			<a href="report.do?verb=TermCount&fields=title+keyword+description&indexToUse=ddsIndex">Term count report: title, description and keyword fields</a><br>
! 			<a href="report.do?verb=TermCount&fields=stems&indexToUse=ddsIndex">Term count report: stems field</a><br>
! 			<a href="report.do?verb=TermCount&fields=default&indexToUse=ddsIndex">Term count report: default field</a>
! 		</div>
! 		</p>
! 	</c:if>
! 	
! 	
! 	<div style="padding-top:10px">
! 	For details about the term count reports, see <a href="REPORT_INFORMATION.txt">REPORT_INFORMATION.txt</a>
! 	</div>	
! 
! 	<br>
! 	
! 	<hr>
! 	
! 	<h1>Other reports</h1>
! 	
! 
! 
! 	<h2>Dup IDs report</h2>
! 	<p>This report shows 
! 	<a href="report.do?verb=ViewDupIds" title="Click to view the list of dup IDs">ID's that exist in more than one record in the system</a>,
! 	which is an error. These are *not* dup records!</p>	
! 
! 	<br>
! 	<h2>IDMapper data</h2>
! 	<p>This page shows 
! 	<a href="report.do?verb=ViewIDMapper" title="Click to view the IDMapper data">IDMapper data for a given record</a></p>	
! 	
! 	<br>
! 	<h2>Show stems</h2>
! 	<p>This form allows you to see the stems used in DDS for given words.</p>	
! 	Enter one or more words separated by space:
! 	<form method="GET" action="report.do" name="stemForm">
! 		<input type="text" name="words" size="50" value="${param.words}">
! 		<input type="hidden" name="verb" value="ViewStems"> 
! 		<input type="submit" value="Show stems">
! 	</form>	
! 	<br><br>
! 	
! </div>
! </body>
! </html:html>
! 
! 
! 
! 
--- 1,137 ----
! <%@ page contentType="text/html; charset=UTF-8" %>
! <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>
! <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
! <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
! <%@ taglib uri="/WEB-INF/tlds/taglibs-application.tld" prefix="app" %>
! <%@ taglib uri='/WEB-INF/tlds/response.tld' prefix='res' %>
! 
! <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
! <%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
! <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
! <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
! <%@ page isELIgnored ="false" %>
! 
! <c:set var="indexLabel">
! 	<c:choose>
! 		<c:when test="${drf.indexToUse == 'webLogIndex'}">
! 			Web log
! 		</c:when>
! 		<c:otherwise>
! 			DDS
! 		</c:otherwise>	
! 	</c:choose>
! </c:set>
! 
! <html:html>
! 
! <!-- $Id$ -->
! 
! <head>
! <title>DDS reporting</title>
! <link rel='stylesheet' type='text/css' href='../dlese_admin_styles.css'>
! 
! <script language="javascript">
! <!--
! 	function useIndex(newIndex){
! 		indexToUse = newIndex.options[newIndex.selectedIndex].value;
! 		
! 		if(indexToUse != ""){
! 			window.location.href = "report.do?indexToUse=" + indexToUse;
! 		}
! 	}
! 
! -->
! </script>
! 
! </head>
! <body onLoad="JavaScript: document.fieldForm.fields.focus()"> 
! <div style="padding-left:15px">
! 	
! 	<p><a href="../admin.do">Back to the Collection Manager</a></p> 
! 
! 	<h1>Term count reports</h1>
! 	
! 
! 	
! 	<p>
! 	<div style="padding-bottom:3px">
! 	Show reports for the following index:
! 	</div>
! 	<html:form action="admin/reporting/report">
! 		<html:select property="indexToUse" value="${drf.indexToUse}" onchange="JavaScript:useIndex(this.form.indexToUse)">
! 			<html:option value="ddsIndex">DDS index</html:option>
! 			<html:option value="webLogIndex">Web log index</html:option>
! 		</html:select>	
! 	</html:form>
! 	</p>
! 	
! 
! 	<h2>Fields in the ${indexLabel} index</h2>
! 	<p>This report shows a <a href="report.do?verb=ListFields&indexToUse=${drf.indexToUse}" title="Click to view the list of fields">list of all fields in the ${indexLabel} index</a>.</p>	
! 
! 	
! 	<h2>Term count reports for the ${indexLabel} index:</h2>
! 	<p>These reports show the terms that exist in the ${indexLabel} index within a given field or
! 	fields. A total term count, total number of documents in which the term appears and 
! 	list of fields in which the term appears
! 	is provided.</p>
! 	
! 	Enter a field or list of fields separated by space below *:
! 	
! 	<form method="GET" action="report.do" name="fieldForm">
! 		<input type="text" name="fields" size="30" value="">
! 		<input type="hidden" name="verb" value="TermCount">
! 		<input type="hidden" name="indexToUse" value="${drf.indexToUse}">
! 		<input type="submit" value="Show report">
! 		<br>* Note that if more than one field is requested the report will take considerably longer to generate.				
! 	</form>		
! 	
! 	<c:if test="${drf.indexToUse == 'ddsIndex'}">
! 		<p>
! 		Or use one of these pre-defined links:
! 		<div style="padding-top:4px">
! 			<a href="report.do?verb=TermCount&fields=title+keyword+description&indexToUse=ddsIndex">Term count report: title, description and keyword fields</a><br>
! 			<a href="report.do?verb=TermCount&fields=stems&indexToUse=ddsIndex">Term count report: stems field</a><br>
! 			<a href="report.do?verb=TermCount&fields=default&indexToUse=ddsIndex">Term count report: default field</a>
! 		</div>
! 		</p>
! 	</c:if>
! 	
! 	
! 	<div style="padding-top:10px">
! 	For details about the term count reports, see <a href="REPORT_INFORMATION.txt">REPORT_INFORMATION.txt</a>
! 	</div>	
! 
! 	<br>
! 	
! 	<hr>
! 	
! 	<h1>Other reports</h1>
! 	
! 	<ul>
! 		<li>
! 			<a href="report.do?verb=ViewDupIds" title="Click to view the list of dup IDs">Dup IDs report</a> - Shows ID's that exist in more than one record in the system,
! 			which is an error. These are *not* dup records!
! 		</li>
! 		<li><a href="report.do?verb=ViewIDMapper" title="Click to view the IDMapper data">IDMapper data</a> - Shows IDMapper data for a given record</li>	
! 		<li><a href="ucar-member-institutions-report.jsp">UCAR Member Institutions</a> - Shows a count of the number of records that
! 		are associated with UCAR member institutions</li>
! 	</ul>
! 	<br>
! 	<h2>Show stems</h2>
! 	<p>This form allows you to see the stems used in DDS for given words.</p>	
! 	Enter one or more words separated by space:
! 	<form method="GET" action="report.do" name="stemForm">
! 		<input type="text" name="words" size="50" value="${param.words}">
! 		<input type="hidden" name="verb" value="ViewStems"> 
! 		<input type="submit" value="Show stems">
! 	</form>	
! 	<br><br>
! 	
! </div>
! </body>
! </html:html>
! 
! 
! 
! 

[Dlese-dds-project] CVS: dds-project/docs CHANGES.txt,1.91,1.92

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

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

Modified Files:
	CHANGES.txt 
Log Message:
-updated docs


Index: CHANGES.txt
===================================================================
RCS file: /cvsroot/dlese/dds-project/docs/CHANGES.txt,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -r1.91 -r1.92
*** CHANGES.txt	4 Nov 2006 01:16:53 -0000	1.91
--- CHANGES.txt	29 Nov 2006 18:16:28 -0000	1.92
***************
*** 16,21 ****
  operations). This ultimately caused the DLESE Library search to return an error message to the user.
  
! -Question marks '?' are now removed from user's searches. Previously such searches produced
! invalid or poor results because '?' is a reserved character in the Lucene query
  syntax. A search for 'is there life on mars?' now returns meaningful results whereas before
  it did not.
--- 16,21 ----
  operations). This ultimately caused the DLESE Library search to return an error message to the user.
  
! -Question marks '?' are now removed from user's searches (UserSearch request in the Web services and elsewhere). 
! Previously such searches produced invalid or poor results because '?' is a reserved character in the Lucene query
  syntax. A search for 'is there life on mars?' now returns meaningful results whereas before
  it did not.

[Dlese-dds-project] CVS: dds-project/web/services index.jsp, 1.62, 1.63

[Lynne <ly...@us...>]

Update of /cvsroot/dlese/dds-project/web/services
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv605/web/services

Modified Files:
	index.jsp 
Log Message:
removed link (and reference) to old libdev/interop/ data provider page.

Index: index.jsp
===================================================================
RCS file: /cvsroot/dlese/dds-project/web/services/index.jsp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -r1.62 -r1.63
*** index.jsp	7 Jul 2006 23:08:14 -0000	1.62
--- index.jsp	28 Nov 2006 23:42:50 -0000	1.63
***************
*** 209,213 ****
    <h4><a name="oai"></a>Open Archive Initiative Data Provider</h4>
    <p>The <a href="oaiDataProvider/index.jsp">DLESE OAI Data Provider</a> exposes the DLESE metadata catalog via the OAI Protocol for Metadata Harvesting, version 2.0. </p>
!   <p>The <a href="http://openarchives.org/" target="_blank">Open Archives Initiative Protocol for Metadata Harvesting</a> (OAI-PMH) is a widely used, standard library protocol for sharing and distributing metadata. The OAI protocol can be used to harvest the entire library catalog or harvest individual collections from the catalog. See the  <a href="http://www.dlese.org/libdev/interop/oai/data_prov.html">OAI data provider</a> area for more information about harvesting metadata from DLESE. </p>
  
    @DCS_SERVICE_JSP@
--- 209,213 ----
    <h4><a name="oai"></a>Open Archive Initiative Data Provider</h4>
    <p>The <a href="oaiDataProvider/index.jsp">DLESE OAI Data Provider</a> exposes the DLESE metadata catalog via the OAI Protocol for Metadata Harvesting, version 2.0. </p>
!   <p>The <a href="http://openarchives.org/" target="_blank">Open Archives Initiative Protocol for Metadata Harvesting</a> (OAI-PMH) is a widely used, standard library protocol for sharing and distributing metadata. The OAI protocol can be used to harvest the entire library catalog or harvest individual collections from the catalog. </p>
  
    @DCS_SERVICE_JSP@