Menu
▾
▴
dlese-web-view — Recieves log notes for the web-view CVS project
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(32) |
May
(61) |
Jun
(77) |
Jul
(20) |
Aug
(4) |
Sep
(24) |
Oct
(1) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(10) |
May
(18) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: John W. <jwe...@us...> - 2007-06-11 22:49:10
|
Update of /cvsroot/dlese/web-view/docs In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv3262/docs Added Files: DLESE_LIBRARY_VERSIONS.txt Log Message: File that provides global version documentation for DLESE projects --- NEW FILE --- This document contains information about the global versioning of the DLESE library as it applies to all CVS projects associated with DLESE. ----------------------------------------------------------------------------- Library v2.6.0 (Released June 11, 2007) Updated the copyright for all DLESE code to include a statement about how to apply proper attribution when using DLESE open source code, software or products. Library v2.5.0 (Released April 27, 2007) Applied a number of bug fixes and minor changes across projects. |
|
From: John W. <jwe...@us...> - 2007-06-11 21:07:16
|
Update of /cvsroot/dlese/web-view In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv31028 Added Files: Tag: standards-demo COPYRIGHT.txt 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. |
|
From: John W. <jwe...@us...> - 2007-06-11 15:45:19
|
Update of /cvsroot/dlese/web-view/web/includes In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv12361/web/includes Modified Files: Tag: standards-demo display_full_desc.jsp Log Message: increased the SAT time out to 90 seconds Index: display_full_desc.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/includes/display_full_desc.jsp,v retrieving revision 1.24.2.3 retrieving revision 1.24.2.4 diff -C2 -r1.24.2.3 -r1.24.2.4 *** display_full_desc.jsp 14 May 2007 18:54:08 -0000 1.24.2.3 --- display_full_desc.jsp 11 Jun 2007 15:45:14 -0000 1.24.2.4 *************** *** 334,338 **** <%-- Inject the state standards using AJAX --%> <div id="stateLdMsg" style="background: url('images/spinner.gif') no-repeat; padding-left: 20px;" class="loadMsg"> ! Fetching <span id="stateName">${state}</span> standards associated with this resource... </div> <div id="stateStandards"></div> --- 334,338 ---- <%-- Inject the state standards using AJAX --%> <div id="stateLdMsg" style="background: url('images/spinner.gif') no-repeat; padding-left: 20px;" class="loadMsg"> ! Fetching <span id="stateName">${state}</span> standards associated with this resource. <nobr>Please wait...</nobr> </div> <div id="stateStandards"></div> |
|
From: John W. <jwe...@us...> - 2007-06-11 15:45:18
|
Update of /cvsroot/dlese/web-view/web In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv12361/web Modified Files: Tag: standards-demo state_standards.jsp state_standards_req_as_asn.jsp view_annotation.jsp Log Message: increased the SAT time out to 90 seconds Index: state_standards.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards.jsp,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -r1.1.2.4 -r1.1.2.5 *** state_standards.jsp 7 May 2007 19:18:26 -0000 1.1.2.4 --- state_standards.jsp 11 Jun 2007 15:45:15 -0000 1.1.2.5 *************** *** 1,4 **** --- 1,8 ---- <%@ page contentType="text/html;charset=UTF-8" %> <%@ include file="/includes/TAGLibIncludes.jsp" %> + + <%-- How long to wait for the SAT service to respond... --%> + <c:set var="satTimeOutInterval" value="90000"/> + <c:set var="lowestGrade" value="13"/> <c:set var="highestGrade" value="-1"/> *************** *** 139,143 **** <c:when test="${hasStateStandards == 'false'}"> <div style="padding-top:10"> ! No standards are available. </div> </c:when> --- 143,151 ---- <c:when test="${hasStateStandards == 'false'}"> <div style="padding-top:10"> ! We were unable to retrieve the standards information at this time. ! <c:if test="${timeOutExc != null}"> ! Timed out after waiting ${satTimeOutInterval/1000} seconds. ! </c:if> ! Please try again later. </div> </c:when> Index: state_standards_req_as_asn.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards_req_as_asn.jsp,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -r1.1.2.10 -r1.1.2.11 *** state_standards_req_as_asn.jsp 22 May 2007 22:51:31 -0000 1.1.2.10 --- state_standards_req_as_asn.jsp 11 Jun 2007 15:45:15 -0000 1.1.2.11 *************** *** 47,51 **** <%-- Make SAT request for standards and store the response. Timeout each request if taking too long. --%> <c:catch var="timeOutExc"> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 40000)}"/> </c:catch> --- 47,51 ---- <%-- Make SAT request for standards and store the response. Timeout each request if taking too long. --%> <c:catch var="timeOutExc"> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', satTimeOutInterval)}"/> </c:catch> *************** *** 53,57 **** <c:choose> <c:when test="${timeOutExc != null}"> ! ${f:systemOut('Warning: SAT request timed out after 40 seconds. Some standards were not retrieved.')} </c:when> <c:otherwise> --- 53,60 ---- <c:choose> <c:when test="${timeOutExc != null}"> ! <c:set var="tom"> ! Warning: SAT request timed out after ${satTimeOutInterval/1000} seconds. Unable to retrieve state standards. ! </c:set> ! ${f:systemOut(tom)} </c:when> <c:otherwise> Index: view_annotation.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/view_annotation.jsp,v retrieving revision 1.9.2.3 retrieving revision 1.9.2.4 diff -C2 -r1.9.2.3 -r1.9.2.4 *** view_annotation.jsp 14 May 2007 18:54:09 -0000 1.9.2.3 --- view_annotation.jsp 11 Jun 2007 15:45:15 -0000 1.9.2.4 *************** *** 285,289 **** <%-- Inject the state standards using AJAX --%> <div id="stateLdMsg" style="background: url('images/spinner.gif') no-repeat; padding-left: 20px;" class="loadMsg"> ! Fetching <span id="stateName">${state}</span> standards associated with this resource... </div> <div id="stateStandards"></div> --- 285,289 ---- <%-- Inject the state standards using AJAX --%> <div id="stateLdMsg" style="background: url('images/spinner.gif') no-repeat; padding-left: 20px;" class="loadMsg"> ! Fetching <span id="stateName">${state}</span> standards associated with this resource. <nobr>Please wait...</nobr> </div> <div id="stateStandards"></div> |
|
From: John W. <jwe...@us...> - 2007-06-07 23:47:15
|
Update of /cvsroot/dlese/web-view In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv19944 Added Files: COPYRIGHT.txt LICENSE.txt Log Message: updated copyright and license --- 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. |
|
From: John W. <jwe...@us...> - 2007-05-22 22:51:35
|
Update of /cvsroot/dlese/web-view/web In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv17332/web Modified Files: Tag: standards-demo state_standards_req_as_asn.jsp Log Message: upped SAT timout to 40 seconds Index: state_standards_req_as_asn.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards_req_as_asn.jsp,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -C2 -r1.1.2.9 -r1.1.2.10 *** state_standards_req_as_asn.jsp 21 May 2007 21:01:11 -0000 1.1.2.9 --- state_standards_req_as_asn.jsp 22 May 2007 22:51:31 -0000 1.1.2.10 *************** *** 47,51 **** <%-- Make SAT request for standards and store the response. Timeout each request if taking too long. --%> <c:catch var="timeOutExc"> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 20000)}"/> </c:catch> --- 47,51 ---- <%-- Make SAT request for standards and store the response. Timeout each request if taking too long. --%> <c:catch var="timeOutExc"> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 40000)}"/> </c:catch> *************** *** 53,57 **** <c:choose> <c:when test="${timeOutExc != null}"> ! ${f:systemOut('Warning: SAT request timed out after 20 seconds. Some standards were not retrieved.')} </c:when> <c:otherwise> --- 53,57 ---- <c:choose> <c:when test="${timeOutExc != null}"> ! ${f:systemOut('Warning: SAT request timed out after 40 seconds. Some standards were not retrieved.')} </c:when> <c:otherwise> |
|
From: John W. <jwe...@us...> - 2007-05-21 21:19:30
|
Update of /cvsroot/dlese/web-view/web In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv14736/web Modified Files: Tag: standards-demo state_standards_req_as_asn.jsp state_standards_req_as_text.jsp Log Message: -updated to use new SAT response for suggestStandards (For descrete results for each ASN ID, uses combineQuery=false param) Index: state_standards_req_as_asn.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards_req_as_asn.jsp,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -r1.1.2.8 -r1.1.2.9 *** state_standards_req_as_asn.jsp 14 May 2007 18:54:09 -0000 1.1.2.8 --- state_standards_req_as_asn.jsp 21 May 2007 21:01:11 -0000 1.1.2.9 *************** *** 3,92 **** <jsp:useBean id="parentNodeMap" class="java.util.TreeMap" scope="page" /> <c:set var="asn_IDs" value=""/> <xtags:forEach select="DDSWebService/GetRecord/record/metadata/nsdl_dc/conformsTo" id="csASN"> <c:set var="asn_ID"><xtags:valueOf context="<%= csASN %>" select="."/></c:set> ! ! <c:choose> ! <%-- Ensure we only send one request per unique ASN ID --%> ! <c:when test="${empty asnIdReqMap[asn_ID]}"> ! <c:set target="${asnIdReqMap}" property="${asn_ID}" value="${asn_ID}"/> ! ! <%-- Gather a string of all the ASN ids, used later: --%> ! <c:set var="asn_IDs" value="${asn_ID};${asn_IDs}"/> ! ! <%-- ${f:systemOut(asn_ID)} ${f:systemOut('')} --%> ! ! <c:url value="http://lehnert.syr.edu:8080/casaa-rest/service.do" var="satRequest"> ! <c:param name="method" value="suggestStandards"/> ! <c:param name="author" value="${selectedState}"/> ! <c:param name="topic" value="Science"/> ! <c:param name="maxResults" value="1"/> ! <c:param name="username" value="test"/> ! <c:param name="password" value="p"/> ! <c:param name="query" value="${asn_ID}"/> ! <c:if test="${lowestGrade+0 <= 13}"> ! <c:param name="startGrade" value="${lowestGrade}"/> ! </c:if> ! <c:if test="${highestGrade+0 >= 0}"> ! <c:param name="endGrade" value="${highestGrade}"/> ! </c:if> ! </c:url> ! ! <%-- ${f:systemOut(satRequest)} --%> ! ! <%-- Make SAT request for standards and store the response. Timeout each request if taking too long. --%> ! <c:catch var="timeOutExc"> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 4000)}"/> ! <%-- <c:import url="${satRequest}" charEncoding="UTF-8" var="satResponse"/> --%> ! </c:catch> ! ! <c:choose> ! <c:when test="${timeOutExc != null}"> ! ${f:systemOut('Warning: SAT request timed out after 4 seconds. Some standards were not retrieved.')} ! </c:when> ! <c:otherwise> ! <c:catch var="parseExc"> ! <x:parse var="satResults">${satResponse}</x:parse> ! <c:set var="asnId"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Identifier"/></c:set> ! <c:if test="${not empty asnId}"> ! <c:set var="hasStateStandards" value="true"/> ! <c:choose> ! <c:when test="${empty standardsMap[asnId]}"> ! <c:set target="${standardsMap}" property="${asnId}" value="${asnId}"/> ! <c:set var="parent"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Text"/></c:set> ! <c:set var="leaf"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Benchmark"/></c:set> ! <%-- Use TreeMaps to group leafs under common parents and apply alpha ordering --%> ! <c:if test="${empty parentNodeMap[parent]}"> ! <% pageContext.setAttribute("leafNodeMap",new java.util.TreeMap()); %> ! <c:set target="${parentNodeMap}" property="${parent}" value="${leafNodeMap}"/> ! </c:if> ! <c:set var="leafNodeMap" value="${parentNodeMap[parent]}"/> ! <c:set target="${leafNodeMap}" property="${leaf}" value=""/> ! <%-- (<a href="${satRequest}" target="_blank">SAT request</a>) --%> ! </c:when> ! <c:otherwise> ! <%-- <ul><li>Dup ID found: ${asnId}</li></ul> --%> ! </c:otherwise> ! </c:choose> ! </c:if> ! </c:catch> ! ${parseExc != null ? f:systemOut('SAT response parse error: Unexpected response') : ''} ! </c:otherwise> ! </c:choose> ! ! </c:when> ! <c:otherwise> ! <%-- ${f:systemOut('Dup ASN ID found on req side')} --%> ! </c:otherwise> ! </c:choose> ! </xtags:forEach> ! <%-- Construct request with all IDs in one request.... <c:url value="http://lehnert.syr.edu:8080/casaa-rest/service.do" var="satRequest"> <c:param name="method" value="suggestStandards"/> <c:param name="author" value="${selectedState}"/> <c:param name="topic" value="Science"/> - <c:param name="maxResults" value="1"/> <c:param name="username" value="test"/> <c:param name="password" value="p"/> --- 3,34 ---- <jsp:useBean id="parentNodeMap" class="java.util.TreeMap" scope="page" /> <c:set var="asn_IDs" value=""/> + + <%-- Grab all the NSES ASN IDs associated with this resource --%> <xtags:forEach select="DDSWebService/GetRecord/record/metadata/nsdl_dc/conformsTo" id="csASN"> <c:set var="asn_ID"><xtags:valueOf context="<%= csASN %>" select="."/></c:set> ! <%-- Ensure we do not send along duplicate ASN IDs --%> ! <c:if test="${empty asnIdReqMap[asn_ID]}"> ! <c:set target="${asnIdReqMap}" property="${asn_ID}" value="${asn_ID}"/> ! ! <%-- Gather a string of all the ASN ids, used later: --%> ! <c:set var="asn_IDs" value="${asn_ID};${asn_IDs}"/> ! </c:if> </xtags:forEach> ! <%-- Construct request with all IDs in one request.... --%> <c:url value="http://lehnert.syr.edu:8080/casaa-rest/service.do" var="satRequest"> <c:param name="method" value="suggestStandards"/> + + <%-- For descrete results for each ASN ID, use combineQuery=false --%> + <c:param name="combineQuery" value="false"/> + <c:param name="maxResults" value="1"/> + + <%-- For combined results across all ASN IDs, use combineQuery=true --%> + <%-- <c:param name="maxResults" value="10"/> + <c:param name="combineQuery" value="true"/> --%> + <c:param name="author" value="${selectedState}"/> <c:param name="topic" value="Science"/> <c:param name="username" value="test"/> <c:param name="password" value="p"/> *************** *** 100,113 **** </c:url> ! <a href="${satRequest}" target="_blank">${satRequest}</a> ${f:systemOut(satRequest)} --%> <%-- Make SAT request for standards and store the response. Timeout each request if taking too long. --%> ! <%-- <c:catch var="timeOutExc"> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 3000)}"/> ! </c:catch> --%> ! <%-- Display the standards: TreeMap ensures alpha ordering and leafs grouped under common parents --%> <c:forEach items="${parentNodeMap}" var="parent"> <ul class="stateStdList"> --- 42,92 ---- </c:url> ! <%-- <a href="${satRequest}" target="_blank">SAT Request</a> ${f:systemOut(satRequest)} --%> <%-- Make SAT request for standards and store the response. Timeout each request if taking too long. --%> ! <c:catch var="timeOutExc"> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 20000)}"/> ! </c:catch> ! ! <%-- Parse the response and compile the results --%> ! <c:choose> ! <c:when test="${timeOutExc != null}"> ! ${f:systemOut('Warning: SAT request timed out after 20 seconds. Some standards were not retrieved.')} ! </c:when> ! <c:otherwise> ! <c:catch var="parseExc"> ! <x:parse var="satResults">${satResponse}</x:parse> ! <x:forEach select="$satResults//SATWebService/SuggestedStandards/Results/Result/Standard" var="satStandard"> ! <c:set var="asnId"><x:out select="$satStandard/Identifier"/></c:set> ! <c:if test="${not empty asnId}"> ! <c:set var="hasStateStandards" value="true"/> ! <c:choose> ! <c:when test="${empty standardsMap[asnId]}"> ! <c:set target="${standardsMap}" property="${asnId}" value="${asnId}"/> ! <c:set var="parent"><x:out select="$satStandard/Text"/></c:set> ! <c:set var="leaf"><x:out select="$satStandard/Benchmark"/></c:set> ! <%-- Use TreeMaps to group leafs under common parents and apply alpha ordering --%> ! <c:if test="${empty parentNodeMap[parent]}"> ! <% pageContext.setAttribute("leafNodeMap",new java.util.TreeMap()); %> ! <c:set target="${parentNodeMap}" property="${parent}" value="${leafNodeMap}"/> ! </c:if> ! <c:set var="leafNodeMap" value="${parentNodeMap[parent]}"/> ! <c:set target="${leafNodeMap}" property="${leaf}" value=""/> ! <%-- (<a href="${satRequest}" target="_blank">SAT request</a>) --%> ! </c:when> ! <c:otherwise> ! <%-- <ul><li>Dup ID found: ${asnId}</li></ul> --%> ! </c:otherwise> ! </c:choose> ! </c:if> ! </x:forEach> ! </c:catch> ! ${parseExc != null ? f:systemOut('SAT response parse error: Unexpected response') : ''} ! </c:otherwise> ! </c:choose> ! <%-- Display the standards: TreeMap ensures alpha ordering and leafs grouped under common parents for display --%> <c:forEach items="${parentNodeMap}" var="parent"> <ul class="stateStdList"> Index: state_standards_req_as_text.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards_req_as_text.jsp,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -r1.1.2.5 -r1.1.2.6 *** state_standards_req_as_text.jsp 14 May 2007 18:54:09 -0000 1.1.2.5 --- state_standards_req_as_text.jsp 21 May 2007 21:01:11 -0000 1.1.2.6 *************** *** 1,4 **** --- 1,6 ---- <%-- Option 2: Search for aligned standards by using NSES text + Note: This implementation needs to be updated to understand the NEW SAT service response (as of 5/21/2007) + Note: This implementation does not use TreeMaps to ensures alpha ordering and leafs grouped under common parents |
|
From: John W. <jwe...@us...> - 2007-05-14 18:54:13
|
Update of /cvsroot/dlese/web-view/web In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv12100/web Modified Files: Tag: standards-demo state_standards_req_as_asn.jsp state_standards_req_as_text.jsp view_annotation.jsp Log Message: -Changed message from 'Loading...' to 'Fetching...' for standards display -Changed timout to 4 seconds for SAT response Index: state_standards_req_as_asn.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards_req_as_asn.jsp,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -r1.1.2.7 -r1.1.2.8 *** state_standards_req_as_asn.jsp 11 May 2007 20:26:38 -0000 1.1.2.7 --- state_standards_req_as_asn.jsp 14 May 2007 18:54:09 -0000 1.1.2.8 *************** *** 36,40 **** <%-- Make SAT request for standards and store the response. Timeout each request if taking too long. --%> <c:catch var="timeOutExc"> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 3000)}"/> <%-- <c:import url="${satRequest}" charEncoding="UTF-8" var="satResponse"/> --%> </c:catch> --- 36,40 ---- <%-- Make SAT request for standards and store the response. Timeout each request if taking too long. --%> <c:catch var="timeOutExc"> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 4000)}"/> <%-- <c:import url="${satRequest}" charEncoding="UTF-8" var="satResponse"/> --%> </c:catch> *************** *** 42,46 **** <c:choose> <c:when test="${timeOutExc != null}"> ! ${f:systemOut('Warning: SAT request timed out after 3 seconds. Some standards were not retrieved.')} </c:when> <c:otherwise> --- 42,46 ---- <c:choose> <c:when test="${timeOutExc != null}"> ! ${f:systemOut('Warning: SAT request timed out after 4 seconds. Some standards were not retrieved.')} </c:when> <c:otherwise> Index: state_standards_req_as_text.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards_req_as_text.jsp,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -r1.1.2.4 -r1.1.2.5 *** state_standards_req_as_text.jsp 7 May 2007 19:18:27 -0000 1.1.2.4 --- state_standards_req_as_text.jsp 14 May 2007 18:54:09 -0000 1.1.2.5 *************** *** 32,38 **** <%-- Make SAT request and store the response --%> <c:catch var="timeOutExc"> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 8000)}"/> </c:catch> ! ${timeOutExc != null ? f:systemOut('Warning: SAT request timed out after 8 seconds. Some standards were not retrieved.') : ''} <c:catch var="parseExc"> --- 32,38 ---- <%-- Make SAT request and store the response --%> <c:catch var="timeOutExc"> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 4000)}"/> </c:catch> ! ${timeOutExc != null ? f:systemOut('Warning: SAT request timed out after 4 seconds. Some standards were not retrieved.') : ''} <c:catch var="parseExc"> Index: view_annotation.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/view_annotation.jsp,v retrieving revision 1.9.2.2 retrieving revision 1.9.2.3 diff -C2 -r1.9.2.2 -r1.9.2.3 *** view_annotation.jsp 1 May 2007 20:38:02 -0000 1.9.2.2 --- view_annotation.jsp 14 May 2007 18:54:09 -0000 1.9.2.3 *************** *** 285,289 **** <%-- Inject the state standards using AJAX --%> <div id="stateLdMsg" style="background: url('images/spinner.gif') no-repeat; padding-left: 20px;" class="loadMsg"> ! Loading <span id="stateName">${state}</span> standards associated with this resource... </div> <div id="stateStandards"></div> --- 285,289 ---- <%-- Inject the state standards using AJAX --%> <div id="stateLdMsg" style="background: url('images/spinner.gif') no-repeat; padding-left: 20px;" class="loadMsg"> ! Fetching <span id="stateName">${state}</span> standards associated with this resource... </div> <div id="stateStandards"></div> |
|
From: John W. <jwe...@us...> - 2007-05-14 18:54:12
|
Update of /cvsroot/dlese/web-view/web/includes In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv12100/web/includes Modified Files: Tag: standards-demo display_full_desc.jsp Log Message: -Changed message from 'Loading...' to 'Fetching...' for standards display -Changed timout to 4 seconds for SAT response Index: display_full_desc.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/includes/display_full_desc.jsp,v retrieving revision 1.24.2.2 retrieving revision 1.24.2.3 diff -C2 -r1.24.2.2 -r1.24.2.3 *** display_full_desc.jsp 4 May 2007 19:25:16 -0000 1.24.2.2 --- display_full_desc.jsp 14 May 2007 18:54:08 -0000 1.24.2.3 *************** *** 334,338 **** <%-- Inject the state standards using AJAX --%> <div id="stateLdMsg" style="background: url('images/spinner.gif') no-repeat; padding-left: 20px;" class="loadMsg"> ! Loading <span id="stateName">${state}</span> standards associated with this resource... </div> <div id="stateStandards"></div> --- 334,338 ---- <%-- Inject the state standards using AJAX --%> <div id="stateLdMsg" style="background: url('images/spinner.gif') no-repeat; padding-left: 20px;" class="loadMsg"> ! Fetching <span id="stateName">${state}</span> standards associated with this resource... </div> <div id="stateStandards"></div> |
|
From: John W. <jwe...@us...> - 2007-05-11 20:26:43
|
Update of /cvsroot/dlese/web-view/web In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv10684/web Modified Files: Tag: standards-demo state_standards_req_as_asn.jsp Log Message: added stubs for requesting all suggested standards in a single request Index: state_standards_req_as_asn.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards_req_as_asn.jsp,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -r1.1.2.6 -r1.1.2.7 *** state_standards_req_as_asn.jsp 8 May 2007 16:29:55 -0000 1.1.2.6 --- state_standards_req_as_asn.jsp 11 May 2007 20:26:38 -0000 1.1.2.7 *************** *** 2,5 **** --- 2,6 ---- <jsp:useBean id="asnIdReqMap" class="java.util.HashMap" scope="page" /> <jsp:useBean id="parentNodeMap" class="java.util.TreeMap" scope="page" /> + <c:set var="asn_IDs" value=""/> <xtags:forEach select="DDSWebService/GetRecord/record/metadata/nsdl_dc/conformsTo" id="csASN"> <c:set var="asn_ID"><xtags:valueOf context="<%= csASN %>" select="."/></c:set> *************** *** 9,13 **** <c:when test="${empty asnIdReqMap[asn_ID]}"> <c:set target="${asnIdReqMap}" property="${asn_ID}" value="${asn_ID}"/> ! <%-- ${f:systemOut(asn_ID)} ${f:systemOut('')} --%> --- 10,17 ---- <c:when test="${empty asnIdReqMap[asn_ID]}"> <c:set target="${asnIdReqMap}" property="${asn_ID}" value="${asn_ID}"/> ! ! <%-- Gather a string of all the ASN ids, used later: --%> ! <c:set var="asn_IDs" value="${asn_ID};${asn_IDs}"/> ! <%-- ${f:systemOut(asn_ID)} ${f:systemOut('')} --%> *************** *** 78,81 **** --- 82,112 ---- </xtags:forEach> + + <%-- Construct request with all IDs in one request.... + <c:url value="http://lehnert.syr.edu:8080/casaa-rest/service.do" var="satRequest"> + <c:param name="method" value="suggestStandards"/> + <c:param name="author" value="${selectedState}"/> + <c:param name="topic" value="Science"/> + <c:param name="maxResults" value="1"/> + <c:param name="username" value="test"/> + <c:param name="password" value="p"/> + <c:param name="query" value="${asn_IDs}"/> + <c:if test="${lowestGrade+0 <= 13}"> + <c:param name="startGrade" value="${lowestGrade}"/> + </c:if> + <c:if test="${highestGrade+0 >= 0}"> + <c:param name="endGrade" value="${highestGrade}"/> + </c:if> + </c:url> + + <a href="${satRequest}" target="_blank">${satRequest}</a> + ${f:systemOut(satRequest)} --%> + + <%-- Make SAT request for standards and store the response. Timeout each request if taking too long. --%> + <%-- <c:catch var="timeOutExc"> + <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 3000)}"/> + </c:catch> --%> + + <%-- Display the standards: TreeMap ensures alpha ordering and leafs grouped under common parents --%> <c:forEach items="${parentNodeMap}" var="parent"> |
|
From: John W. <jwe...@us...> - 2007-05-08 16:32:58
|
Update of /cvsroot/dlese/web-view/docs In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv21419/docs Modified Files: Tag: standards-demo CHANGES.txt Log Message: merged HEAD into SAT branch Index: CHANGES.txt =================================================================== RCS file: /cvsroot/dlese/web-view/docs/CHANGES.txt,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -r1.4.2.1 -r1.4.2.2 *** CHANGES.txt 27 Apr 2007 23:06:04 -0000 1.4.2.1 --- CHANGES.txt 8 May 2007 16:32:49 -0000 1.4.2.2 *************** *** 2,6 **** --- 2,8 ---- This document was last modified on: + $Id$ + ----------------------------------------------------------------------------- |
|
From: John W. <jwe...@us...> - 2007-05-08 16:29:58
|
Update of /cvsroot/dlese/web-view/web In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv20251/web Modified Files: Tag: standards-demo state_standards_req_as_asn.jsp Log Message: -changed SAT response timeout from 2 to 3 seconds Index: state_standards_req_as_asn.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards_req_as_asn.jsp,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -r1.1.2.5 -r1.1.2.6 *** state_standards_req_as_asn.jsp 7 May 2007 19:18:27 -0000 1.1.2.5 --- state_standards_req_as_asn.jsp 8 May 2007 16:29:55 -0000 1.1.2.6 *************** *** 30,36 **** <%-- ${f:systemOut(satRequest)} --%> ! <%-- Make SAT request and store the response. Timeout each request if taking too long. --%> <c:catch var="timeOutExc"> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 2000)}"/> <%-- <c:import url="${satRequest}" charEncoding="UTF-8" var="satResponse"/> --%> </c:catch> --- 30,36 ---- <%-- ${f:systemOut(satRequest)} --%> ! <%-- Make SAT request for standards and store the response. Timeout each request if taking too long. --%> <c:catch var="timeOutExc"> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 3000)}"/> <%-- <c:import url="${satRequest}" charEncoding="UTF-8" var="satResponse"/> --%> </c:catch> *************** *** 38,42 **** <c:choose> <c:when test="${timeOutExc != null}"> ! ${f:systemOut('Warning: SAT request timed out after 2 seconds. Some standards were not retrieved.')} </c:when> <c:otherwise> --- 38,42 ---- <c:choose> <c:when test="${timeOutExc != null}"> ! ${f:systemOut('Warning: SAT request timed out after 3 seconds. Some standards were not retrieved.')} </c:when> <c:otherwise> *************** *** 59,71 **** <c:set target="${leafNodeMap}" property="${leaf}" value=""/> <%-- (<a href="${satRequest}" target="_blank">SAT request</a>) --%> - - <%-- <ul class="stateStdList"> - <li class="stateStdList">${parent}</li> - <ul class="stateStdList"> - <li> - ${leaf} - </li> - </ul> - </ul> --%> </c:when> <c:otherwise> --- 59,62 ---- |
Update of /cvsroot/dlese/web-view/web In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv20521/web Modified Files: Tag: standards-demo discovery_styles_screen.css state_standards.jsp state_standards_req_as_asn.jsp state_standards_req_as_text.jsp Log Message: -State standards are now shown in alphabetical order and leaf nodes are grouped under a single parent when present -Fixed character display issue where ? was displayed by setting content type to UTF-8 in the state_standards.jsp AJAX response -Limit SAT request to topic Science -Applied more spacing in the standards display Index: discovery_styles_screen.css =================================================================== RCS file: /cvsroot/dlese/web-view/web/discovery_styles_screen.css,v retrieving revision 1.16.2.1 retrieving revision 1.16.2.2 diff -C2 -r1.16.2.1 -r1.16.2.2 *** discovery_styles_screen.css 30 Apr 2007 23:21:01 -0000 1.16.2.1 --- discovery_styles_screen.css 7 May 2007 19:18:26 -0000 1.16.2.2 *************** *** 289,291 **** --- 289,297 ---- color: #555555; } + .stateStdList UL { + margin: 0px 0px 10px 18px; + } + .stateStdList LI { + margin: 0px 0px 4px 0px; + } Index: state_standards.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards.jsp,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** state_standards.jsp 2 May 2007 21:09:32 -0000 1.1.2.3 --- state_standards.jsp 7 May 2007 19:18:26 -0000 1.1.2.4 *************** *** 1,2 **** --- 1,3 ---- + <%@ page contentType="text/html;charset=UTF-8" %> <%@ include file="/includes/TAGLibIncludes.jsp" %> <c:set var="lowestGrade" value="13"/> Index: state_standards_req_as_asn.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards_req_as_asn.jsp,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -r1.1.2.4 -r1.1.2.5 *** state_standards_req_as_asn.jsp 4 May 2007 19:25:16 -0000 1.1.2.4 --- state_standards_req_as_asn.jsp 7 May 2007 19:18:27 -0000 1.1.2.5 *************** *** 1,4 **** --- 1,5 ---- <%-- Option 1: Search for aligned standards by ASN ID --%> <jsp:useBean id="asnIdReqMap" class="java.util.HashMap" scope="page" /> + <jsp:useBean id="parentNodeMap" class="java.util.TreeMap" scope="page" /> <xtags:forEach select="DDSWebService/GetRecord/record/metadata/nsdl_dc/conformsTo" id="csASN"> <c:set var="asn_ID"><xtags:valueOf context="<%= csASN %>" select="."/></c:set> *************** *** 14,17 **** --- 15,19 ---- <c:param name="method" value="suggestStandards"/> <c:param name="author" value="${selectedState}"/> + <c:param name="topic" value="Science"/> <c:param name="maxResults" value="1"/> <c:param name="username" value="test"/> *************** *** 47,57 **** <c:when test="${empty standardsMap[asnId]}"> <c:set target="${standardsMap}" property="${asnId}" value="${asnId}"/> ! <ul> ! <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Text"/></li> ! <ul> ! <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Benchmark"/></li> ! <%-- <li>(<a href="${satRequest}" target="_blank">SAT request</a>)</li> --%> </ul> ! </ul> </c:when> <c:otherwise> --- 49,71 ---- <c:when test="${empty standardsMap[asnId]}"> <c:set target="${standardsMap}" property="${asnId}" value="${asnId}"/> ! <c:set var="parent"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Text"/></c:set> ! <c:set var="leaf"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Benchmark"/></c:set> ! <%-- Use TreeMaps to group leafs under common parents and apply alpha ordering --%> ! <c:if test="${empty parentNodeMap[parent]}"> ! <% pageContext.setAttribute("leafNodeMap",new java.util.TreeMap()); %> ! <c:set target="${parentNodeMap}" property="${parent}" value="${leafNodeMap}"/> ! </c:if> ! <c:set var="leafNodeMap" value="${parentNodeMap[parent]}"/> ! <c:set target="${leafNodeMap}" property="${leaf}" value=""/> ! <%-- (<a href="${satRequest}" target="_blank">SAT request</a>) --%> ! ! <%-- <ul class="stateStdList"> ! <li class="stateStdList">${parent}</li> ! <ul class="stateStdList"> ! <li> ! ${leaf} ! </li> </ul> ! </ul> --%> </c:when> <c:otherwise> *************** *** 72,73 **** --- 86,99 ---- </xtags:forEach> + + <%-- Display the standards: TreeMap ensures alpha ordering and leafs grouped under common parents --%> + <c:forEach items="${parentNodeMap}" var="parent"> + <ul class="stateStdList"> + <li class="stateStdList">${parent.key}</li> + <ul class="stateStdList"> + <c:forEach items="${parent.value}" var="leaf"> + <li>${leaf.key}</li> + </c:forEach> + </ul> + </ul> + </c:forEach> Index: state_standards_req_as_text.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards_req_as_text.jsp,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** state_standards_req_as_text.jsp 4 May 2007 19:25:16 -0000 1.1.2.3 --- state_standards_req_as_text.jsp 7 May 2007 19:18:27 -0000 1.1.2.4 *************** *** 1,3 **** ! <%-- Option 2: Search for aligned standards by using NSES text --%> <xtags:forEach select="DDSWebService/GetRecord/record/head/additionalMetadata/adn/renderingGuidelines/contentStandardOPML/opml/body/outline/outline/outline/outline/outline" id="csOPML"> <c:set var="csText"><xtags:valueOf context="<%= csOPML %>" select="@groups:vocab"/></c:set> --- 1,8 ---- ! <%-- Option 2: Search for aligned standards by using NSES text ! ! Note: This implementation does not use ! TreeMaps to ensures alpha ordering and leafs grouped under common parents ! ! --%> <xtags:forEach select="DDSWebService/GetRecord/record/head/additionalMetadata/adn/renderingGuidelines/contentStandardOPML/opml/body/outline/outline/outline/outline/outline" id="csOPML"> <c:set var="csText"><xtags:valueOf context="<%= csOPML %>" select="@groups:vocab"/></c:set> *************** *** 11,14 **** --- 16,20 ---- <c:param name="method" value="suggestStandards"/> <c:param name="author" value="${selectedState}"/> + <c:param name="topic" value="Science"/> <c:param name="maxResults" value="1"/> <c:param name="username" value="test"/> *************** *** 38,45 **** <c:when test="${empty standardsMap[asnId]}"> <c:set target="${standardsMap}" property="${asnId}" value="${asnId}"/> ! <ul> ! <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Text"/></li> ! <ul> ! <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Benchmark"/></li> <%-- <li>(<a href="${satRequest}" target="_blank">SAT request</a>)</li> --%> </ul> --- 44,51 ---- <c:when test="${empty standardsMap[asnId]}"> <c:set target="${standardsMap}" property="${asnId}" value="${asnId}"/> ! <ul class="stateStdList"> ! <li class="stateStdList"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Text"/></li> ! <ul class="stateStdList"> ! <li class="stateStdList"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Benchmark"/></li> <%-- <li>(<a href="${satRequest}" target="_blank">SAT request</a>)</li> --%> </ul> |
|
From: John W. <jwe...@us...> - 2007-05-04 23:38:46
|
Update of /cvsroot/dlese/web-view/docs In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv29155/docs Added Files: Tag: standards-demo dsv.html Log Message: updated documentation for library v2.5 --- NEW FILE --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <title> Documentation for DLESE Search View </title> <link rel="stylesheet" type="text/css" href="/dlese_shared/dlese_styles_screen.css" /> <link rel="stylesheet" type="text/css" href="/insideDPC/libdev/docs/docs_styles.css" /> </head> <body> <h1> Documentation for DLESE Search View </h1> <h2> Version </h2> <p>1.0.5</p> <ul> <li><a href="http://dlese.cvs.sourceforge.net/dlese/web-view/docs/CHANGES.txt?view=markup">Changes since last release</a></li> <li><a href="dsv/url_structures.html">URL structures</a> compared to DDS v3.2</li> </ul> <h2> Description </h2> <!-- Description and purpose of the component. Include links to diagrams as appropriate. --> <p>This application provides a search over DLESE ADN library resources. </p> <h2> Audience </h2> <p>Users of the DLESE library who want to find educational resources pertaining to Earth System Science.</p> <h2> How this component is used </h2> <p>Users of the DLESE library perform keyword and controlled vocabulary search queries, and are presented with library resources that most closely match their request.</p> <h2> Functional requirements </h2> <p>Provide a Web interface for dlese.org that allows for searching over library resources via the <a href="search_web_services.html">Search Web Services</a>.</p> <h2> Implementation technologies & rationale </h2> <!-- What technologies and why: --> <ul> <li>Search Web Services — The foundation of DLESE's "Web 2.0" development approach.</li> <li>Java/JSP + JSTL — The main programming language and API used to produce DLESE software. The JSTL tag library provides intuitive logic tags as well as XPath-based processing of source XML packets.</li> <li>XSL — Certain parts of UI are rendered using modular XSL transforms that can be plugged into any XSL-capable system. XSL processing is available for most Web development platforms such as JSP/JSTL, and today's Web browsers are also capable of it.</li> <li>JavaScript (a.k.a. DHTML/Ajax) — Browser scripting allows for dynamically updating parts of a page without a refresh/redraw of the entire interface. <i>Asynchronous</i> JavaScript requests ("Ajax") allow such updating to happen using new content pulled from the server, which reduces—and potentially eliminates—the need to <i>preload</i> such content.</li> </ul> <h2> Development process and workflow </h2> <!-- Description of the development process and a typical workflow. Include tools used such as Ant, CVS, JEdit, Dreamweaver, Spy, scripts, etc. Include specifics such as what machines things are run on, what directories data is saved to, etc. such that an outsider might be able to participate in the development process after reading this description. --> <p> This system follows the same basic <a href="software-development-process.html">development process and workflow</a> used by most DLESE JSP-based projects. </p> <h2> Testing and maintenance procedures </h2> <!-- Describe the procedures used to test the component for accuracy, performance and bugs and how it is updated and maintained over time. Include testing tools such as spell checkers, JUnit, JMeter, debuggers, etc. --> <p>As the library <i>view</i>, this application is tested using the major browsers (IE, Firefox, Safari). The Firefox JavaScript/CSS debugger is particularly helpful at pinpointing any errors in the dynamic functionality of the interface.</p> <h2> Dependencies on other DLESE components </h2> <!-- List of other components that this component uses and/or interacts with, both internal and external to the DPC. Include links to documentation and descriptions of those components if possible --> <ul> <li><a href="search_web_services.html">DLESE Search Web Services</a></li> <li><a href="dlese-shared.html">DLESE Shared</a></li> <li><a href="metadata-ui-manager.html">Metadata UI Manager</a></li> </ul> <a name="future"></a> <h2> Future development </h2> <!-- List additional features and functionality that is anticipated for future development of the component --> <p>Remove the following UIs from the DDS and re-implement using Web Services:</p> <ul> <li>Browse resources & collections</li> <li>New resources in the library</li> </ul> <h2> Links to additional documentation </h2> <!-- Links to JavaDocs, diagrams or additional documentation relevant to this component --> <ul> <li><a href="http://www.dlese.org/dds/services/ddsws1-1/index.jsp">Search Web Service</a></li> </ul> <p> <br> <i>Last updated: May, 2007 </i><br> <i>Author: R</i><em>yan Deardorff</em><em>, John Weatherley <br> </em></p> </body> </html> |
|
From: John W. <jwe...@us...> - 2007-05-04 23:38:46
|
Update of /cvsroot/dlese/web-view/docs/dsv In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv29155/docs/dsv Added Files: Tag: standards-demo url_structures.html Log Message: updated documentation for library v2.5 --- NEW FILE --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <title>URL structures for DLESE Search View - DSV 1.0 vs. DDS 3.2 </title> <link rel="stylesheet" type="text/css" href="http://www.dlese.org/dlese_shared/dlese_styles_screen.css" /> <link rel="stylesheet" type="text/css" href="http://www.dpc.ucar.edu/insideDPC/libdev/docs/docs_styles.css" /> <style type="text/css"> LI { font-family: Courier New, Courier; margin-top: 4px; padding-top: 4px; } H3 { margin-bottom: 5px; padding-bottom: 5px; } .lists { margin-left: 7px; padding-left: 7px; } </style> </head> <body> <h1 class="hasSubHead">URL structures for DLESE Search View</h1> <h2>DSV 1.0 vs. DDS 3.2</h2> <p style="text-align: center;"> <a href="#search">Search</a> | <a href="#resources">Resource information</a> | <a href="#collections">Collections</a> | <a href="#browse">Browse</a> | <a href="#newresources">New resources & reviews</a> | <a href="#redirect">Resource visit redirect linking</a> </p> <p>As of version 3.3 of the DDS, much—but not all—of the library UI has been rewritten using the Web Services in a new project known as the <i>DLESE Search View</i>. While the URL structure of some pages remains the same (except for the new <tt>/library/</tt> context), some changes were necessary in order to reflect a refined UI that provides more information from within the search results listings, i.e. the "Choosing & Using this resource" panels.</p> <a name="search"></a> <h3>Search</h3> <p>Except for the application context (<tt>/dds/</tt> vs. <tt>/library/</tt>), search URLs are the same in both systems.</p> <div class="lists"> <b>Basic search and paged search:</b> <ul> <li>/<i>context</i>/query.do?q=[<i>search keywords</i>]&[<i>vocab field encoded id</i>]=[<i>vocab value encoded id</i>]&s=[<i>starting index ((page - 1) * 10)</i>]</li> </ul> <b>Browse-invoked search and paged search by vocab:</b> <ul> <li>/<i>context</i>/query.do?q=[<i>search keywords</i>]&[<i>vocab field encoded id</i>]=[<i>vocab value encoded id</i>]&s=[<i>starting index</i>]&hist=true</li> </ul> <b>Browse-invoked search by vocab (spoofed):</b> <ul> <li>/<i>context</i>/browse_[<i>vocab field encoded id</i>]_[<i>vocab value encoded id</i>].htm</li> </ul> <b>Browse-invoked <i>paged</i> search by vocab (spoofed):</b> <ul> <li>/<i>context</i>/browse_[<i>vocab field encoded id</i>]_[<i>vocab value encoded id</i>]-[<i>starting index</i>].htm</li> </ul> <b>Browse-invoked search and paged search by vocab and collection:</b> <ul> <li>/<i>context</i>/query.do?q=[<i>search keywords</i>]&[<i>collection field encoded id</i>]=[<i>collection value encoded id</i>]&[<i>vocab field encoded id</i>]=[<i>vocab value encoded id</i>]&s=[<i>starting index</i>]&hist=true</li> </ul> <b>Browse-invoked search by vocab and collection (spoofed):</b> <ul> <li>/<i>context</i>/browse_[<i>collection field encoded id</i>]_[<i>collection value encoded id</i>]_[<i>vocab field encoded id</i>]_[<i>vocab value encoded id</i>].htm</li> </ul> <b>Browse-invoked <i>paged</i> search by vocab and collection (spoofed):</b> <ul> <li>/<i>context</i>/browse_[<i>collection field encoded id</i>]_[<i>collection value encoded id</i>]_[<i>vocab field encoded id</i>]_[<i>vocab value encoded id</i>]-[<i>starting index</i>].htm</li> </ul> </div> <a name="resources"></a> <h3>Resource information</h3> <p>Information about library resources is navigated in various ways.</p> <div class="lists"> <b>Full description of a resource:</b> <ul> <li>/<i>context</i>/view_resource.do?description=[<i>resource record id</i>]</li> </ul> <b>Full description of a resource (spoofed):</b> <ul> <li>/<i>context</i>/catalog_[<i>record id</i>].htm</li> </ul> <b>Reviews, teaching tips, and related resources:</b> <ul> <li>DSV: N/A</li> <li>DDS: /dds/view_resource.do?reviews=[<i>collection record id</i>]</li> </ul> <b>"Choosing & Using" expansion:</b> <ul> <li>DSV: /library/choosing_using_click.jsp?Q=[<i>search keywords</i>]&R=[<i>resource search result index</i>]&ST=[<i>search resources total</i>]&LT=[<i>library resources total</i>]&ID=[<i>resource record id</i>]&URL=[<i>resource url</i>]</li> <li>DDS: N/A</li> </ul> <b>Standards associated with a resource:</b> <ul> <li>DSV: /library/view_annotation.do?type=standards&id=[<i>resource record id</i>]&other=false</li> <li>DDS: /dds/view_resource.do?description=[<i>resource record id</i>]#standards</li> </ul> </div> <a name="collections"></a> <h3>Collections</h3> <p>In the new DSV UI, collection descriptions are displayed only as part of the browse views, which as of DSV v1.0.4 are still produced by the DDS.</p> <div class="lists"> <b>Collection description:</b> <ul> <li>DSV: N/A (/dds/histogram.do?group=subject&key=[<i>collection vocab field</i>])</li> <li>DDS: /dds/collection.do?key=[<i>collection vocab field</i>]</li> </ul> <b>Collection description browsed from "Choosing & Using":</b> <ul> <li>DSV: N/A (/dds/histogram.do?group=subject&key=[<i>collection vocab field</i>]&PrimaryID=[<i>primary resource id</i>])</li> <li>DDS: N/A </li> </ul> <b>Collections that contain a resource:</b> <ul> <li>DSV: N/A</li> <li>DDS: /dds/view_resource.do?description_all=[<i>collection record id</i>]&coll=[<i>collection encoded id key</i>]</li> </ul> </div> <a name="browse"></a> <h3>Browse</h3> <p>As of DSV v1.0.4, browse functionality is still provided by the DDS.</p> <div class="lists"> <b>Browse by vocab:</b> <ul> <li>/dds/histogram.do?group=[<i>vocab field</i>]</li> </ul> <b>Browse default / by subject (spoofed):</b> <ul> <li>/dds/browse.htm</li> </ul> <b>Browse by vocab (spoofed):</b> <ul> <li>/dds/browsenav_[<i>vocab field</i>].htm</li> </ul> <b>Browse by vocab and collection:</b> <ul> <li>/dds/histogram.do?group=[<i>vocab field</i>]&key=[<i>collection vocab encoded id</i>]</li> </ul> <b>Browse collection invoked from "Choosing & Using":</b> <ul> <li>/dds/histogram.do?group=subject&key=[<i>collection vocab encoded id</i>]&PrimaryID=[<i>resource record id</i>]</li> </ul> </div> <a name="newresources"></a> <h3>New resources & reviews</h3> <p>As of DSV 1.0.4, new resources functionality is still provided by the DDS. The parameter that produces this type of results list is "wnfrom," where a value of "recent" specifies a search over the last six weeks, and a value of "rss" produces RSS views of recent resources.</p> <div class="lists"> <b>New resources:</b> <ul> <li>/dds/query.do?q=&s=0&sortby=wndate&wntype=itemnew&wnfrom=[recent|<i>year-month-day</i>]</li> </ul> <b>New resources, last six weeks (spoofed):</b> <ul> <li>/dds/new.htm</li> </ul> <b>Newly reviewed resources:</b> <ul> <li>/dds/query.do?q=&s=0&sortby=wndate&wntype=itemannocomplete&wnfrom=[recent|<i>year-month-day</i>]</li> </ul> <b>Newly reviewed resources, last six weeks (spoofed):</b> <ul> <li>/dds/newReviewed.htm</li> </ul> <b>New resources under review:</b> <ul> <li>/dds/query.do?q=&s=0&sortby=wndate&wntype=itemannoinprogress&wnfrom=[recent|<i>year-month-day</i>]</li> </ul> <b>New resources under review, last six weeks (spoofed):</b> <ul> <li>/dds/newToReview.htm</li> </ul> <b>RSS feeds:</b> <ul> <li>/dds/services/rss2-0?q=&s=0&sortby=wndate&wntype=[itemnew|itemannoinprogress|itemannocomplete]&wnfrom=rss&show=[<i>maximum number of resources</i>]</li> </ul> </div> <a name="redirect"></a> <h3>Resource visit redirect links</h3> <p>When users of the library visit resources they find, a link redirecting system is used to capture information about where in the library UI the link was clicked. </p> <div class="lists"> <b>From search results brief description title:</b> <ul> <li>DSV: http://rd.dlese.org/T=[search|hist]&Q=[<i>keywords</i>]&R=[<i>resource search result index</i>]&ST=[<i>search total</i>]&LT=[<i>library total</i>]&SC=[<i>search client</i>]&ID=[<i>record id</i>]*[<i>resource url</i>]</li> <li>DDS: http://rd.dlese.org/T=[search|hist]&Q=[<i>keywords</i>]&R=[<i>resource search result index</i>]&ST=[<i>search total</i>]&LT=[<i>library total</i>]&ID=[<i>record id</i>]*[<i>resource url</i>]</li> </ul> <b>From resource full description page:</b> <ul> <li>http://rd.dlese.org/T=view&ID=[<i>resource record id</i>]*[<i>resource url</i>]</li> </ul> <b>From related resources and collections (under "Choosing & Using"):</b> <ul> <li>DSV: http://rd.dlese.org/T=search-related&PrimaryID=[<i>primary resource record id</i>]&ID=[<i>related resource record id</i>]*[<i>resource url</i>]</li> <li>DDS: N/A</li> </ul> <b>From related resources on the full description page:</b> <ul> <li>http://rd.dlese.org/T=view-related&PrimaryID=[<i>primary resource record id</i>]&ID=[<i>related resource record id</i>]*[<i>resource url</i>]</li> </ul> <b>From reviews, teaching tips, and related resources page:</b> <ul> <li>DSV: N/A</li> <li>DDS: http://rd.dlese.org/T=reviews*[<i>resource url</i>]</li> </ul> <b>Resource contact/creator/publisher link from full description page:</b> <ul> <li>DSV: http://rd.dlese.org/T=view-creator&ID=[<i>resource record id</i>]*[<i>contact url</i>]</li> <li>DDS: http://rd.dlese.org/T=viewCreator/ID=[<i>resource record id</i>]/*[<i>contact url</i>]</li> </ul> </div> <p> <i>Contact: <a href="mailto:su...@dl...">su...@dl...</a></i><br> <i>Last updated: September 11, 2006</i><br> <i>Author: Ryan Deardorff</i><br> </p> <br> </body> </html> |
|
From: John W. <jwe...@us...> - 2007-05-04 23:38:09
|
Update of /cvsroot/dlese/web-view/docs In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv28786/docs Added Files: dsv.html Log Message: updated documentation for library v2.5 --- NEW FILE --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <title> Documentation for DLESE Search View </title> <link rel="stylesheet" type="text/css" href="/dlese_shared/dlese_styles_screen.css" /> <link rel="stylesheet" type="text/css" href="/insideDPC/libdev/docs/docs_styles.css" /> </head> <body> <h1> Documentation for DLESE Search View </h1> <h2> Version </h2> <p>1.0.5</p> <ul> <li><a href="http://dlese.cvs.sourceforge.net/dlese/web-view/docs/CHANGES.txt?view=markup">Changes since last release</a></li> <li><a href="dsv/url_structures.html">URL structures</a> compared to DDS v3.2</li> </ul> <h2> Description </h2> <!-- Description and purpose of the component. Include links to diagrams as appropriate. --> <p>This application provides a search over DLESE ADN library resources. </p> <h2> Audience </h2> <p>Users of the DLESE library who want to find educational resources pertaining to Earth System Science.</p> <h2> How this component is used </h2> <p>Users of the DLESE library perform keyword and controlled vocabulary search queries, and are presented with library resources that most closely match their request.</p> <h2> Functional requirements </h2> <p>Provide a Web interface for dlese.org that allows for searching over library resources via the <a href="search_web_services.html">Search Web Services</a>.</p> <h2> Implementation technologies & rationale </h2> <!-- What technologies and why: --> <ul> <li>Search Web Services — The foundation of DLESE's "Web 2.0" development approach.</li> <li>Java/JSP + JSTL — The main programming language and API used to produce DLESE software. The JSTL tag library provides intuitive logic tags as well as XPath-based processing of source XML packets.</li> <li>XSL — Certain parts of UI are rendered using modular XSL transforms that can be plugged into any XSL-capable system. XSL processing is available for most Web development platforms such as JSP/JSTL, and today's Web browsers are also capable of it.</li> <li>JavaScript (a.k.a. DHTML/Ajax) — Browser scripting allows for dynamically updating parts of a page without a refresh/redraw of the entire interface. <i>Asynchronous</i> JavaScript requests ("Ajax") allow such updating to happen using new content pulled from the server, which reduces—and potentially eliminates—the need to <i>preload</i> such content.</li> </ul> <h2> Development process and workflow </h2> <!-- Description of the development process and a typical workflow. Include tools used such as Ant, CVS, JEdit, Dreamweaver, Spy, scripts, etc. Include specifics such as what machines things are run on, what directories data is saved to, etc. such that an outsider might be able to participate in the development process after reading this description. --> <p> This system follows the same basic <a href="software-development-process.html">development process and workflow</a> used by most DLESE JSP-based projects. </p> <h2> Testing and maintenance procedures </h2> <!-- Describe the procedures used to test the component for accuracy, performance and bugs and how it is updated and maintained over time. Include testing tools such as spell checkers, JUnit, JMeter, debuggers, etc. --> <p>As the library <i>view</i>, this application is tested using the major browsers (IE, Firefox, Safari). The Firefox JavaScript/CSS debugger is particularly helpful at pinpointing any errors in the dynamic functionality of the interface.</p> <h2> Dependencies on other DLESE components </h2> <!-- List of other components that this component uses and/or interacts with, both internal and external to the DPC. Include links to documentation and descriptions of those components if possible --> <ul> <li><a href="search_web_services.html">DLESE Search Web Services</a></li> <li><a href="dlese-shared.html">DLESE Shared</a></li> <li><a href="metadata-ui-manager.html">Metadata UI Manager</a></li> </ul> <a name="future"></a> <h2> Future development </h2> <!-- List additional features and functionality that is anticipated for future development of the component --> <p>Remove the following UIs from the DDS and re-implement using Web Services:</p> <ul> <li>Browse resources & collections</li> <li>New resources in the library</li> </ul> <h2> Links to additional documentation </h2> <!-- Links to JavaDocs, diagrams or additional documentation relevant to this component --> <ul> <li><a href="http://www.dlese.org/dds/services/ddsws1-1/index.jsp">Search Web Service</a></li> </ul> <p> <br> <i>Last updated: May, 2007 </i><br> <i>Author: R</i><em>yan Deardorff</em><em>, John Weatherley <br> </em></p> </body> </html> |
|
From: John W. <jwe...@us...> - 2007-05-04 23:38:09
|
Update of /cvsroot/dlese/web-view/docs/dsv In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv28786/docs/dsv Added Files: url_structures.html Log Message: updated documentation for library v2.5 --- NEW FILE --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> <title>URL structures for DLESE Search View - DSV 1.0 vs. DDS 3.2 </title> <link rel="stylesheet" type="text/css" href="http://www.dlese.org/dlese_shared/dlese_styles_screen.css" /> <link rel="stylesheet" type="text/css" href="http://www.dpc.ucar.edu/insideDPC/libdev/docs/docs_styles.css" /> <style type="text/css"> LI { font-family: Courier New, Courier; margin-top: 4px; padding-top: 4px; } H3 { margin-bottom: 5px; padding-bottom: 5px; } .lists { margin-left: 7px; padding-left: 7px; } </style> </head> <body> <h1 class="hasSubHead">URL structures for DLESE Search View</h1> <h2>DSV 1.0 vs. DDS 3.2</h2> <p style="text-align: center;"> <a href="#search">Search</a> | <a href="#resources">Resource information</a> | <a href="#collections">Collections</a> | <a href="#browse">Browse</a> | <a href="#newresources">New resources & reviews</a> | <a href="#redirect">Resource visit redirect linking</a> </p> <p>As of version 3.3 of the DDS, much—but not all—of the library UI has been rewritten using the Web Services in a new project known as the <i>DLESE Search View</i>. While the URL structure of some pages remains the same (except for the new <tt>/library/</tt> context), some changes were necessary in order to reflect a refined UI that provides more information from within the search results listings, i.e. the "Choosing & Using this resource" panels.</p> <a name="search"></a> <h3>Search</h3> <p>Except for the application context (<tt>/dds/</tt> vs. <tt>/library/</tt>), search URLs are the same in both systems.</p> <div class="lists"> <b>Basic search and paged search:</b> <ul> <li>/<i>context</i>/query.do?q=[<i>search keywords</i>]&[<i>vocab field encoded id</i>]=[<i>vocab value encoded id</i>]&s=[<i>starting index ((page - 1) * 10)</i>]</li> </ul> <b>Browse-invoked search and paged search by vocab:</b> <ul> <li>/<i>context</i>/query.do?q=[<i>search keywords</i>]&[<i>vocab field encoded id</i>]=[<i>vocab value encoded id</i>]&s=[<i>starting index</i>]&hist=true</li> </ul> <b>Browse-invoked search by vocab (spoofed):</b> <ul> <li>/<i>context</i>/browse_[<i>vocab field encoded id</i>]_[<i>vocab value encoded id</i>].htm</li> </ul> <b>Browse-invoked <i>paged</i> search by vocab (spoofed):</b> <ul> <li>/<i>context</i>/browse_[<i>vocab field encoded id</i>]_[<i>vocab value encoded id</i>]-[<i>starting index</i>].htm</li> </ul> <b>Browse-invoked search and paged search by vocab and collection:</b> <ul> <li>/<i>context</i>/query.do?q=[<i>search keywords</i>]&[<i>collection field encoded id</i>]=[<i>collection value encoded id</i>]&[<i>vocab field encoded id</i>]=[<i>vocab value encoded id</i>]&s=[<i>starting index</i>]&hist=true</li> </ul> <b>Browse-invoked search by vocab and collection (spoofed):</b> <ul> <li>/<i>context</i>/browse_[<i>collection field encoded id</i>]_[<i>collection value encoded id</i>]_[<i>vocab field encoded id</i>]_[<i>vocab value encoded id</i>].htm</li> </ul> <b>Browse-invoked <i>paged</i> search by vocab and collection (spoofed):</b> <ul> <li>/<i>context</i>/browse_[<i>collection field encoded id</i>]_[<i>collection value encoded id</i>]_[<i>vocab field encoded id</i>]_[<i>vocab value encoded id</i>]-[<i>starting index</i>].htm</li> </ul> </div> <a name="resources"></a> <h3>Resource information</h3> <p>Information about library resources is navigated in various ways.</p> <div class="lists"> <b>Full description of a resource:</b> <ul> <li>/<i>context</i>/view_resource.do?description=[<i>resource record id</i>]</li> </ul> <b>Full description of a resource (spoofed):</b> <ul> <li>/<i>context</i>/catalog_[<i>record id</i>].htm</li> </ul> <b>Reviews, teaching tips, and related resources:</b> <ul> <li>DSV: N/A</li> <li>DDS: /dds/view_resource.do?reviews=[<i>collection record id</i>]</li> </ul> <b>"Choosing & Using" expansion:</b> <ul> <li>DSV: /library/choosing_using_click.jsp?Q=[<i>search keywords</i>]&R=[<i>resource search result index</i>]&ST=[<i>search resources total</i>]&LT=[<i>library resources total</i>]&ID=[<i>resource record id</i>]&URL=[<i>resource url</i>]</li> <li>DDS: N/A</li> </ul> <b>Standards associated with a resource:</b> <ul> <li>DSV: /library/view_annotation.do?type=standards&id=[<i>resource record id</i>]&other=false</li> <li>DDS: /dds/view_resource.do?description=[<i>resource record id</i>]#standards</li> </ul> </div> <a name="collections"></a> <h3>Collections</h3> <p>In the new DSV UI, collection descriptions are displayed only as part of the browse views, which as of DSV v1.0.4 are still produced by the DDS.</p> <div class="lists"> <b>Collection description:</b> <ul> <li>DSV: N/A (/dds/histogram.do?group=subject&key=[<i>collection vocab field</i>])</li> <li>DDS: /dds/collection.do?key=[<i>collection vocab field</i>]</li> </ul> <b>Collection description browsed from "Choosing & Using":</b> <ul> <li>DSV: N/A (/dds/histogram.do?group=subject&key=[<i>collection vocab field</i>]&PrimaryID=[<i>primary resource id</i>])</li> <li>DDS: N/A </li> </ul> <b>Collections that contain a resource:</b> <ul> <li>DSV: N/A</li> <li>DDS: /dds/view_resource.do?description_all=[<i>collection record id</i>]&coll=[<i>collection encoded id key</i>]</li> </ul> </div> <a name="browse"></a> <h3>Browse</h3> <p>As of DSV v1.0.4, browse functionality is still provided by the DDS.</p> <div class="lists"> <b>Browse by vocab:</b> <ul> <li>/dds/histogram.do?group=[<i>vocab field</i>]</li> </ul> <b>Browse default / by subject (spoofed):</b> <ul> <li>/dds/browse.htm</li> </ul> <b>Browse by vocab (spoofed):</b> <ul> <li>/dds/browsenav_[<i>vocab field</i>].htm</li> </ul> <b>Browse by vocab and collection:</b> <ul> <li>/dds/histogram.do?group=[<i>vocab field</i>]&key=[<i>collection vocab encoded id</i>]</li> </ul> <b>Browse collection invoked from "Choosing & Using":</b> <ul> <li>/dds/histogram.do?group=subject&key=[<i>collection vocab encoded id</i>]&PrimaryID=[<i>resource record id</i>]</li> </ul> </div> <a name="newresources"></a> <h3>New resources & reviews</h3> <p>As of DSV 1.0.4, new resources functionality is still provided by the DDS. The parameter that produces this type of results list is "wnfrom," where a value of "recent" specifies a search over the last six weeks, and a value of "rss" produces RSS views of recent resources.</p> <div class="lists"> <b>New resources:</b> <ul> <li>/dds/query.do?q=&s=0&sortby=wndate&wntype=itemnew&wnfrom=[recent|<i>year-month-day</i>]</li> </ul> <b>New resources, last six weeks (spoofed):</b> <ul> <li>/dds/new.htm</li> </ul> <b>Newly reviewed resources:</b> <ul> <li>/dds/query.do?q=&s=0&sortby=wndate&wntype=itemannocomplete&wnfrom=[recent|<i>year-month-day</i>]</li> </ul> <b>Newly reviewed resources, last six weeks (spoofed):</b> <ul> <li>/dds/newReviewed.htm</li> </ul> <b>New resources under review:</b> <ul> <li>/dds/query.do?q=&s=0&sortby=wndate&wntype=itemannoinprogress&wnfrom=[recent|<i>year-month-day</i>]</li> </ul> <b>New resources under review, last six weeks (spoofed):</b> <ul> <li>/dds/newToReview.htm</li> </ul> <b>RSS feeds:</b> <ul> <li>/dds/services/rss2-0?q=&s=0&sortby=wndate&wntype=[itemnew|itemannoinprogress|itemannocomplete]&wnfrom=rss&show=[<i>maximum number of resources</i>]</li> </ul> </div> <a name="redirect"></a> <h3>Resource visit redirect links</h3> <p>When users of the library visit resources they find, a link redirecting system is used to capture information about where in the library UI the link was clicked. </p> <div class="lists"> <b>From search results brief description title:</b> <ul> <li>DSV: http://rd.dlese.org/T=[search|hist]&Q=[<i>keywords</i>]&R=[<i>resource search result index</i>]&ST=[<i>search total</i>]&LT=[<i>library total</i>]&SC=[<i>search client</i>]&ID=[<i>record id</i>]*[<i>resource url</i>]</li> <li>DDS: http://rd.dlese.org/T=[search|hist]&Q=[<i>keywords</i>]&R=[<i>resource search result index</i>]&ST=[<i>search total</i>]&LT=[<i>library total</i>]&ID=[<i>record id</i>]*[<i>resource url</i>]</li> </ul> <b>From resource full description page:</b> <ul> <li>http://rd.dlese.org/T=view&ID=[<i>resource record id</i>]*[<i>resource url</i>]</li> </ul> <b>From related resources and collections (under "Choosing & Using"):</b> <ul> <li>DSV: http://rd.dlese.org/T=search-related&PrimaryID=[<i>primary resource record id</i>]&ID=[<i>related resource record id</i>]*[<i>resource url</i>]</li> <li>DDS: N/A</li> </ul> <b>From related resources on the full description page:</b> <ul> <li>http://rd.dlese.org/T=view-related&PrimaryID=[<i>primary resource record id</i>]&ID=[<i>related resource record id</i>]*[<i>resource url</i>]</li> </ul> <b>From reviews, teaching tips, and related resources page:</b> <ul> <li>DSV: N/A</li> <li>DDS: http://rd.dlese.org/T=reviews*[<i>resource url</i>]</li> </ul> <b>Resource contact/creator/publisher link from full description page:</b> <ul> <li>DSV: http://rd.dlese.org/T=view-creator&ID=[<i>resource record id</i>]*[<i>contact url</i>]</li> <li>DDS: http://rd.dlese.org/T=viewCreator/ID=[<i>resource record id</i>]/*[<i>contact url</i>]</li> </ul> </div> <p> <i>Contact: <a href="mailto:su...@dl...">su...@dl...</a></i><br> <i>Last updated: September 11, 2006</i><br> <i>Author: Ryan Deardorff</i><br> </p> <br> </body> </html> |
|
From: John W. <jwe...@us...> - 2007-05-04 23:37:41
|
Update of /cvsroot/dlese/web-view/docs/dsv In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv28763/dsv Log Message: Directory /cvsroot/dlese/web-view/docs/dsv added to the repository |
|
From: John W. <jwe...@us...> - 2007-05-04 19:25:22
|
Update of /cvsroot/dlese/web-view/web In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5205/web Modified Files: Tag: standards-demo state_standards.js state_standards_req_as_asn.jsp state_standards_req_as_text.jsp Log Message: National standards in full description now display only after state standards have loaded, couple other tweaks Index: state_standards.js =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards.js,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** state_standards.js 2 May 2007 21:09:32 -0000 1.1.2.3 --- state_standards.js 4 May 2007 19:25:16 -0000 1.1.2.4 *************** *** 29,32 **** --- 29,34 ---- if($('stateName') && state) $('stateName').update(state); + if($('fullDescNatStand')) + $('fullDescNatStand').hide(); var selectedState = $('selectedState'); if(selectedState) { *************** *** 55,58 **** --- 57,62 ---- if($('stateStds')) $('stateStds').show(); + if($('fullDescNatStand')) + $('fullDescNatStand').show(); }, onFailure: function(transport) { *************** *** 60,64 **** $('stateLdMsg').hide(); if($('stateList')) ! $('stateList').hide(); } }); --- 64,70 ---- $('stateLdMsg').hide(); if($('stateList')) ! $('stateList').hide(); ! if($('fullDescNatStand')) ! $('fullDescNatStand').show(); } }); Index: state_standards_req_as_asn.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards_req_as_asn.jsp,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -r1.1.2.3 -r1.1.2.4 *** state_standards_req_as_asn.jsp 2 May 2007 21:09:32 -0000 1.1.2.3 --- state_standards_req_as_asn.jsp 4 May 2007 19:25:16 -0000 1.1.2.4 *************** *** 26,30 **** </c:url> ! ${f:systemOut(satRequest)} <%-- Make SAT request and store the response. Timeout each request if taking too long. --%> --- 26,30 ---- </c:url> ! <%-- ${f:systemOut(satRequest)} --%> <%-- Make SAT request and store the response. Timeout each request if taking too long. --%> *************** *** 33,61 **** <%-- <c:import url="${satRequest}" charEncoding="UTF-8" var="satResponse"/> --%> </c:catch> - ${timeOutExc != null ? f:systemOut('Warning: SAT request timed out after 2 seconds. Some standards were not retrieved.') : ''} ! <c:catch var="parseExc"> ! <x:parse var="satResults">${satResponse}</x:parse> ! <c:set var="asnId"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Identifier"/></c:set> ! <c:if test="${not empty asnId}"> ! <c:set var="hasStateStandards" value="true"/> ! <c:choose> ! <c:when test="${empty standardsMap[asnId]}"> ! <c:set target="${standardsMap}" property="${asnId}" value="${asnId}"/> ! <ul> ! <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Text"/></li> <ul> ! <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Benchmark"/></li> ! <%-- <li>(<a href="${satRequest}" target="_blank">SAT request</a>)</li> --%> </ul> ! </ul> ! </c:when> ! <c:otherwise> ! <%-- <ul><li>Dup ID found: ${asnId}</li></ul> --%> ! </c:otherwise> ! </c:choose> ! </c:if> ! </c:catch> ! ${parseExc != null ? f:systemOut('SAT response parse error: Unexpected response') : ''} </c:when> --- 33,67 ---- <%-- <c:import url="${satRequest}" charEncoding="UTF-8" var="satResponse"/> --%> </c:catch> ! <c:choose> ! <c:when test="${timeOutExc != null}"> ! ${f:systemOut('Warning: SAT request timed out after 2 seconds. Some standards were not retrieved.')} ! </c:when> ! <c:otherwise> ! <c:catch var="parseExc"> ! <x:parse var="satResults">${satResponse}</x:parse> ! <c:set var="asnId"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Identifier"/></c:set> ! <c:if test="${not empty asnId}"> ! <c:set var="hasStateStandards" value="true"/> ! <c:choose> ! <c:when test="${empty standardsMap[asnId]}"> ! <c:set target="${standardsMap}" property="${asnId}" value="${asnId}"/> <ul> ! <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Text"/></li> ! <ul> ! <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Benchmark"/></li> ! <%-- <li>(<a href="${satRequest}" target="_blank">SAT request</a>)</li> --%> ! </ul> </ul> ! </c:when> ! <c:otherwise> ! <%-- <ul><li>Dup ID found: ${asnId}</li></ul> --%> ! </c:otherwise> ! </c:choose> ! </c:if> ! </c:catch> ! ${parseExc != null ? f:systemOut('SAT response parse error: Unexpected response') : ''} ! </c:otherwise> ! </c:choose> </c:when> Index: state_standards_req_as_text.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards_req_as_text.jsp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** state_standards_req_as_text.jsp 2 May 2007 21:09:32 -0000 1.1.2.2 --- state_standards_req_as_text.jsp 4 May 2007 19:25:16 -0000 1.1.2.3 *************** *** 1,5 **** <%-- Option 2: Search for aligned standards by using NSES text --%> ! <xtags:forEach select="DDSWebService/GetRecord/record/head/additionalMetadata/adn/renderingGuidelines/contentStandardOPML/opml/body/outline/outline/outline" id="csOPML"> ! <c:set var="csText"><xtags:valueOf context="<%= csOPML %>" select="outline/outline/@groups:vocab"/></c:set> <%-- ${f:systemOut(csText)} ${f:systemOut('')} --%> <c:set var="csNodes" value="${fn:split(csText,':')}"/> --- 1,5 ---- <%-- Option 2: Search for aligned standards by using NSES text --%> ! <xtags:forEach select="DDSWebService/GetRecord/record/head/additionalMetadata/adn/renderingGuidelines/contentStandardOPML/opml/body/outline/outline/outline/outline/outline" id="csOPML"> ! <c:set var="csText"><xtags:valueOf context="<%= csOPML %>" select="@groups:vocab"/></c:set> <%-- ${f:systemOut(csText)} ${f:systemOut('')} --%> <c:set var="csNodes" value="${fn:split(csText,':')}"/> *************** *** 7,11 **** <%-- Perform the request only if we have a 4th level NSES leaf node --%> <c:if test="${fn:length(csNodes) == 5}"> ! <%-- ${f:systemOut(csNodes[4])} --%> <c:url value="http://lehnert.syr.edu:8080/casaa-rest/service.do" var="satRequest"> <c:param name="method" value="suggestStandards"/> --- 7,11 ---- <%-- Perform the request only if we have a 4th level NSES leaf node --%> <c:if test="${fn:length(csNodes) == 5}"> ! ${f:systemOut(csNodes[4])} <c:url value="http://lehnert.syr.edu:8080/casaa-rest/service.do" var="satRequest"> <c:param name="method" value="suggestStandards"/> *************** *** 23,27 **** </c:url> ! ${f:systemOut(satRequest)} <%-- Make SAT request and store the response --%> <c:catch var="timeOutExc"> --- 23,27 ---- </c:url> ! <%-- ${f:systemOut(satRequest)} --%> <%-- Make SAT request and store the response --%> <c:catch var="timeOutExc"> |
|
From: John W. <jwe...@us...> - 2007-05-04 19:25:20
|
Update of /cvsroot/dlese/web-view/web/includes In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5205/web/includes Modified Files: Tag: standards-demo display_full_desc.jsp Log Message: National standards in full description now display only after state standards have loaded, couple other tweaks Index: display_full_desc.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/includes/display_full_desc.jsp,v retrieving revision 1.24.2.1 retrieving revision 1.24.2.2 diff -C2 -r1.24.2.1 -r1.24.2.2 *** display_full_desc.jsp 2 May 2007 21:09:32 -0000 1.24.2.1 --- display_full_desc.jsp 4 May 2007 19:25:16 -0000 1.24.2.2 *************** *** 321,352 **** <td align="left" valign="top" width="50%"> ! <%-- Display state standards using AJAX --%> ! <div style="padding-left:15; padding-bottom:15; padding-top:10;"> ! <c:set var="state"> ! <c:choose> ! <c:when test="${not empty selectedState && selectedState != 'NONE'}">${selectedState}</c:when> ! <c:otherwise>state</c:otherwise> ! </c:choose> ! </c:set> ! <%-- Inject the state standards using AJAX --%> ! <div id="stateLdMsg" style="background: url('images/spinner.gif') no-repeat; padding-left: 20px;" class="loadMsg"> ! Loading <span id="stateName">${state}</span> standards associated with this resource... ! </div> ! <div id="stateStandards"></div> ! </div> ! ! ! <c:set var="vocabOPML"><xtags:copyOf select="DDSWebService/GetRecord/record/head/additionalMetadata/adn/renderingGuidelines/contentStandardOPML/opml"/></c:set> ! <c:if test="${ not empty vocabOPML }"> ! <div class="descHeader">National education standards:</div> ! <c:catch var="xslError"> ! <c:import var="transformXsl" url="includes/vocabs_tab_indented.xsl" /> ! <x:transform xml="${ vocabOPML }" xslt="${ transformXsl }" /> ! </c:catch> ! <c:if test="${ not empty xslError }"> ! <!-- ${ xslError } --> ! </c:if> ! </c:if> </td> --- 321,354 ---- <td align="left" valign="top" width="50%"> ! <c:set var="vocabOPML"><xtags:copyOf select="DDSWebService/GetRecord/record/head/additionalMetadata/adn/renderingGuidelines/contentStandardOPML/opml"/></c:set> + <c:if test="${ not empty vocabOPML }"> + <%-- Display state standards using AJAX --%> + <div style="padding-left:15; padding-bottom:15; padding-top:10;"> + <c:set var="state"> + <c:choose> + <c:when test="${not empty selectedState && selectedState != 'NONE'}">${selectedState}</c:when> + <c:otherwise>state</c:otherwise> + </c:choose> + </c:set> + <%-- Inject the state standards using AJAX --%> + <div id="stateLdMsg" style="background: url('images/spinner.gif') no-repeat; padding-left: 20px;" class="loadMsg"> + Loading <span id="stateName">${state}</span> standards associated with this resource... + </div> + <div id="stateStandards"></div> + </div> + + <%-- Display National Standards... --%> + <div id="fullDescNatStand" style="display:none"> + <div class="descHeader">National education standards:</div> + <c:catch var="xslError"> + <c:import var="transformXsl" url="includes/vocabs_tab_indented.xsl" /> + <x:transform xml="${ vocabOPML }" xslt="${ transformXsl }" /> + </c:catch> + <c:if test="${ not empty xslError }"> + <!-- ${ xslError } --> + </c:if> + </div> + </c:if> </td> |
Update of /cvsroot/dlese/web-view/web In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv17229/web Modified Files: Tag: standards-demo state_standards.js state_standards.jsp state_standards_req_as_asn.jsp state_standards_req_as_text.jsp Log Message: -added state standards display to the full description page Index: state_standards.js =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards.js,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** state_standards.js 1 May 2007 20:38:01 -0000 1.1.2.2 --- state_standards.js 2 May 2007 21:09:32 -0000 1.1.2.3 *************** *** 3,12 **** function onPageLoad() { if(typeof(parms.id) != 'undefined') ! selectState(parms.id); } var ajaxReq = null; function selectState(id,state) { if($('stateStds')) $('stateStds').hide(); --- 3,24 ---- function onPageLoad() { + var myId = ''; if(typeof(parms.id) != 'undefined') ! myId = parms.id; ! else if(typeof(recordId) != 'undefined') ! myId = recordId; ! ! if(myId.length > 0) ! selectState(myId); ! else if($('stateLdMsg')) ! $('stateLdMsg').hide(); } var ajaxReq = null; + var currentId = ''; function selectState(id,state) { + if(typeof(id) != 'undefined') + currentId = id; + //alert('currentId:' + currentId + ' state:' + state); if($('stateStds')) $('stateStds').hide(); *************** *** 28,34 **** //alert('stateStandards'); if(state) ! var p = { id: id, locStd: state } else ! var p = { id: id } if(ajaxReq != null) --- 40,46 ---- //alert('stateStandards'); if(state) ! var p = { id: currentId, locStd: state } else ! var p = { id: currentId } if(ajaxReq != null) *************** *** 42,46 **** $('stateList').show(); if($('stateStds')) ! $('stateStds').show(); }, onFailure: function(transport) { --- 54,58 ---- $('stateList').show(); if($('stateStds')) ! $('stateStds').show(); }, onFailure: function(transport) { *************** *** 48,52 **** $('stateLdMsg').hide(); if($('stateList')) ! $('stateList').show(); } }); --- 60,64 ---- $('stateLdMsg').hide(); if($('stateList')) ! $('stateList').hide(); } }); Index: state_standards.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards.jsp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** state_standards.jsp 1 May 2007 20:38:02 -0000 1.1.2.2 --- state_standards.jsp 2 May 2007 21:09:32 -0000 1.1.2.3 *************** *** 104,108 **** <%-- Create a HashMap to de-dup the standards that are displayed --%> <jsp:useBean id="standardsMap" class="java.util.HashMap" scope="page" /> ! <span class="dlese_vocabs_top_level_header">${selectedState} Educational Standards</span>: <c:set var="hasStateStandards" value="false"/> --- 104,108 ---- <%-- Create a HashMap to de-dup the standards that are displayed --%> <jsp:useBean id="standardsMap" class="java.util.HashMap" scope="page" /> ! <span class="dlese_vocabs_top_level_header" style="font-weight: bold">${selectedState} educational standards</span>: <c:set var="hasStateStandards" value="false"/> Index: state_standards_req_as_asn.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards_req_as_asn.jsp,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -r1.1.2.2 -r1.1.2.3 *** state_standards_req_as_asn.jsp 1 May 2007 20:38:02 -0000 1.1.2.2 --- state_standards_req_as_asn.jsp 2 May 2007 21:09:32 -0000 1.1.2.3 *************** *** 1,46 **** <%-- Option 1: Search for aligned standards by ASN ID --%> <xtags:forEach select="DDSWebService/GetRecord/record/metadata/nsdl_dc/conformsTo" id="csASN"> <c:set var="asn_ID"><xtags:valueOf context="<%= csASN %>" select="."/></c:set> - <%-- ${f:systemOut(asn_ID)} ${f:systemOut('')} --%> - <%-- ${f:systemOut(csNodes[4])} --%> - <c:url value="http://lehnert.syr.edu:8080/casaa-rest/service.do" var="satRequest"> - <c:param name="method" value="suggestStandards"/> - <c:param name="author" value="${selectedState}"/> - <c:param name="maxResults" value="1"/> - <c:param name="username" value="test"/> - <c:param name="password" value="p"/> - <c:param name="query" value="${asn_ID}"/> - <c:if test="${lowestGrade+0 <= 13}"> - <c:param name="startGrade" value="${lowestGrade}"/> - </c:if> - <c:if test="${highestGrade+0 >= 0}"> - <c:param name="endGrade" value="${highestGrade}"/> - </c:if> - </c:url> - - <%-- Make SAT request and store the response. Timeout each request after waiting 8 seconds. --%> - <c:catch var="timeOutExc"> - <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 8000)}"/> - </c:catch> - ${timeOutExc != null ? f:systemOut('Warning: SAT request timed out after 8 seconds. Some standards were not retrieved.') : ''} - - <x:parse var="satResults">${satResponse}</x:parse> - <c:set var="asnId"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Identifier"/></c:set> - <c:if test="${not empty asnId}"><c:set var="hasStateStandards" value="true"/></c:if> <c:choose> ! <c:when test="${empty standardsMap[asnId]}"> ! <c:set target="${standardsMap}" property="${asnId}" value="${asnId}"/> ! <ul> ! <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Text"/></li> ! <ul> ! <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Benchmark"/></li> ! <%-- <li>(<a href="${satRequest}" target="_blank">SAT request</a>)</li> --%> ! </ul> ! </ul> </c:when> <c:otherwise> ! <%-- <ul><li>Dup ID found: ${asnId}</li></ul> --%> </c:otherwise> ! </c:choose> </xtags:forEach> --- 1,67 ---- <%-- Option 1: Search for aligned standards by ASN ID --%> + <jsp:useBean id="asnIdReqMap" class="java.util.HashMap" scope="page" /> <xtags:forEach select="DDSWebService/GetRecord/record/metadata/nsdl_dc/conformsTo" id="csASN"> <c:set var="asn_ID"><xtags:valueOf context="<%= csASN %>" select="."/></c:set> <c:choose> ! <%-- Ensure we only send one request per unique ASN ID --%> ! <c:when test="${empty asnIdReqMap[asn_ID]}"> ! <c:set target="${asnIdReqMap}" property="${asn_ID}" value="${asn_ID}"/> ! ! <%-- ${f:systemOut(asn_ID)} ${f:systemOut('')} --%> ! ! <c:url value="http://lehnert.syr.edu:8080/casaa-rest/service.do" var="satRequest"> ! <c:param name="method" value="suggestStandards"/> ! <c:param name="author" value="${selectedState}"/> ! <c:param name="maxResults" value="1"/> ! <c:param name="username" value="test"/> ! <c:param name="password" value="p"/> ! <c:param name="query" value="${asn_ID}"/> ! <c:if test="${lowestGrade+0 <= 13}"> ! <c:param name="startGrade" value="${lowestGrade}"/> ! </c:if> ! <c:if test="${highestGrade+0 >= 0}"> ! <c:param name="endGrade" value="${highestGrade}"/> ! </c:if> ! </c:url> ! ! ${f:systemOut(satRequest)} ! ! <%-- Make SAT request and store the response. Timeout each request if taking too long. --%> ! <c:catch var="timeOutExc"> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 2000)}"/> ! <%-- <c:import url="${satRequest}" charEncoding="UTF-8" var="satResponse"/> --%> ! </c:catch> ! ${timeOutExc != null ? f:systemOut('Warning: SAT request timed out after 2 seconds. Some standards were not retrieved.') : ''} ! ! <c:catch var="parseExc"> ! <x:parse var="satResults">${satResponse}</x:parse> ! <c:set var="asnId"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Identifier"/></c:set> ! <c:if test="${not empty asnId}"> ! <c:set var="hasStateStandards" value="true"/> ! <c:choose> ! <c:when test="${empty standardsMap[asnId]}"> ! <c:set target="${standardsMap}" property="${asnId}" value="${asnId}"/> ! <ul> ! <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Text"/></li> ! <ul> ! <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Benchmark"/></li> ! <%-- <li>(<a href="${satRequest}" target="_blank">SAT request</a>)</li> --%> ! </ul> ! </ul> ! </c:when> ! <c:otherwise> ! <%-- <ul><li>Dup ID found: ${asnId}</li></ul> --%> ! </c:otherwise> ! </c:choose> ! </c:if> ! </c:catch> ! ${parseExc != null ? f:systemOut('SAT response parse error: Unexpected response') : ''} ! </c:when> <c:otherwise> ! <%-- ${f:systemOut('Dup ASN ID found on req side')} --%> </c:otherwise> ! </c:choose> ! </xtags:forEach> Index: state_standards_req_as_text.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards_req_as_text.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** state_standards_req_as_text.jsp 30 Apr 2007 23:21:01 -0000 1.1.2.1 --- state_standards_req_as_text.jsp 2 May 2007 21:09:32 -0000 1.1.2.2 *************** *** 25,47 **** ${f:systemOut(satRequest)} <%-- Make SAT request and store the response --%> ! <c:import url="${satRequest}" charEncoding="UTF-8" var="satResponse"/> ! <x:parse var="satResults">${satResponse}</x:parse> ! <c:set var="asnId"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Identifier"/></c:set> ! <c:if test="${not empty asnId}"><c:set var="hasStateStandards" value="true"/></c:if> ! <c:choose> ! <c:when test="${empty standardsMap[asnId]}"> ! <c:set target="${standardsMap}" property="${asnId}" value="${asnId}"/> ! <ul> ! <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Text"/></li> ! <ul> ! <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Benchmark"/></li> ! <%-- <li>(<a href="${satRequest}" target="_blank">SAT request</a>)</li> --%> ! </ul> ! </ul> ! </c:when> ! <c:otherwise> ! <%-- <ul><li>Dup ID found: ${asnId}</li></ul> --%> ! </c:otherwise> ! </c:choose> </c:if> </xtags:forEach> --- 25,57 ---- ${f:systemOut(satRequest)} <%-- Make SAT request and store the response --%> ! <c:catch var="timeOutExc"> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 8000)}"/> ! </c:catch> ! ${timeOutExc != null ? f:systemOut('Warning: SAT request timed out after 8 seconds. Some standards were not retrieved.') : ''} ! ! <c:catch var="parseExc"> ! <x:parse var="satResults">${satResponse}</x:parse> ! <c:set var="asnId"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Identifier"/></c:set> ! <c:if test="${not empty asnId}"> ! <c:set var="hasStateStandards" value="true"/> ! <c:choose> ! <c:when test="${empty standardsMap[asnId]}"> ! <c:set target="${standardsMap}" property="${asnId}" value="${asnId}"/> ! <ul> ! <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Text"/></li> ! <ul> ! <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Benchmark"/></li> ! <%-- <li>(<a href="${satRequest}" target="_blank">SAT request</a>)</li> --%> ! </ul> ! </ul> ! </c:when> ! <c:otherwise> ! <%-- <ul><li>Dup ID found: ${asnId}</li></ul> --%> ! </c:otherwise> ! </c:choose> ! </c:if> ! </c:catch> ! ${parseExc != null ? f:systemOut('SAT response parse error: Unexpected response') : ''} ! </c:if> </xtags:forEach> |
|
From: John W. <jwe...@us...> - 2007-05-02 21:09:45
|
Update of /cvsroot/dlese/web-view/web/includes In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv17229/web/includes Modified Files: Tag: standards-demo display_full_desc.jsp Log Message: -added state standards display to the full description page Index: display_full_desc.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/includes/display_full_desc.jsp,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -C2 -r1.24 -r1.24.2.1 *** display_full_desc.jsp 13 Sep 2006 00:06:04 -0000 1.24 --- display_full_desc.jsp 2 May 2007 21:09:32 -0000 1.24.2.1 *************** *** 1,3 **** --- 1,6 ---- <c:set var="Id">${param.description}</c:set> + <script type="text/javascript"> + var recordId = '${Id}'; + </script> <c:set var="drcPresent"> *************** *** 174,199 **** Error: ${xslError} </c:if> ! ! <div style="margin-top: 6px;"> ! <span class="descHeader">DLESE Catalog ID:</span> ! <span>${Id}</span> ! </div> ! ! ! </td> ! <td align="left" valign="top" width="50%"> ! ! <c:set var="vocabOPML"><xtags:copyOf select="DDSWebService/GetRecord/record/head/additionalMetadata/adn/renderingGuidelines/contentStandardOPML/opml"/></c:set> ! <c:if test="${ not empty vocabOPML }"> ! <div class="descHeader">Educational standards:</div> ! <c:catch var="xslError"> ! <c:import var="transformXsl" url="includes/vocabs_tab_indented.xsl" /> ! <x:transform xml="${ vocabOPML }" xslt="${ transformXsl }" /> ! </c:catch> ! <c:if test="${ not empty xslError }"> ! <!-- ${ xslError } --> ! </c:if> ! </c:if> ! <c:set var="relations"> --- 177,183 ---- Error: ${xslError} </c:if> ! ! ! <c:set var="relations"> *************** *** 321,325 **** --- 305,351 ---- </xtags:choose></div><br> </xtags:forEach> + + + + + <div style="margin-top: 6px;"> + <span class="descHeader">DLESE Catalog ID:</span> + <span>${Id}</span> + </div> + + + </td> + + + <td align="left" valign="top" width="50%"> + + <%-- Display state standards using AJAX --%> + <div style="padding-left:15; padding-bottom:15; padding-top:10;"> + <c:set var="state"> + <c:choose> + <c:when test="${not empty selectedState && selectedState != 'NONE'}">${selectedState}</c:when> + <c:otherwise>state</c:otherwise> + </c:choose> + </c:set> + <%-- Inject the state standards using AJAX --%> + <div id="stateLdMsg" style="background: url('images/spinner.gif') no-repeat; padding-left: 20px;" class="loadMsg"> + Loading <span id="stateName">${state}</span> standards associated with this resource... + </div> + <div id="stateStandards"></div> + </div> + + + <c:set var="vocabOPML"><xtags:copyOf select="DDSWebService/GetRecord/record/head/additionalMetadata/adn/renderingGuidelines/contentStandardOPML/opml"/></c:set> + <c:if test="${ not empty vocabOPML }"> + <div class="descHeader">National education standards:</div> + <c:catch var="xslError"> + <c:import var="transformXsl" url="includes/vocabs_tab_indented.xsl" /> + <x:transform xml="${ vocabOPML }" xslt="${ transformXsl }" /> + </c:catch> + <c:if test="${ not empty xslError }"> + <!-- ${ xslError } --> + </c:if> + </c:if> |
|
From: John W. <jwe...@us...> - 2007-05-01 20:38:10
|
Update of /cvsroot/dlese/web-view/web In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv1520/web Modified Files: Tag: standards-demo state_standards.js state_standards.jsp state_standards_req_as_asn.jsp view_annotation.jsp Log Message: -Added error handling for canceled requests, and timout for slow SAT responses Index: state_standards.js =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards.js,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** state_standards.js 30 Apr 2007 23:21:01 -0000 1.1.2.1 --- state_standards.js 1 May 2007 20:38:01 -0000 1.1.2.2 *************** *** 1,36 **** - Event.observe(window, 'load', onPageLoad, false); var parms = window.location.search.parseQuery(); function onPageLoad() { ! selectState(parms.id); } function selectState(id,state) { if($('stateStds')) ! $('stateStds').hide(); ! if($('stateUpMsg')) { ! var selectedState = $('selectedState'); if(state && state != 'NONE' && selectedState) selectedState.update(' ' + state + ' '); else if(selectedState) selectedState.update(' '); - $('stateUpMsg').show(); } if($('stateStandards')) { if(state) var p = { id: id, locStd: state } else ! var p = { id: id } ! new Ajax.Updater('stateStandards', 'state_standards.jsp', { parameters: p, ! onSuccess: function() { if($('stateLdMsg')) $('stateLdMsg').hide(); ! if($('stateUpMsg')) ! $('stateUpMsg').hide(); if($('stateStds')) $('stateStds').show(); ! } }); } --- 1,53 ---- Event.observe(window, 'load', onPageLoad, false); var parms = window.location.search.parseQuery(); function onPageLoad() { ! if(typeof(parms.id) != 'undefined') ! selectState(parms.id); } + var ajaxReq = null; function selectState(id,state) { if($('stateStds')) ! $('stateStds').hide(); ! if($('stateList')) ! $('stateList').hide(); ! if($('stateLdMsg')) ! $('stateLdMsg').show(); ! if($('stateName') && state) ! $('stateName').update(state); ! var selectedState = $('selectedState'); ! if(selectedState) { if(state && state != 'NONE' && selectedState) selectedState.update(' ' + state + ' '); else if(selectedState) selectedState.update(' '); } + if($('stateStandards')) { + //alert('stateStandards'); if(state) var p = { id: id, locStd: state } else ! var p = { id: id } ! ! if(ajaxReq != null) ! ajaxReq.transport.abort(); ! ajaxReq = new Ajax.Updater('stateStandards', 'state_standards.jsp', { parameters: p, ! onSuccess: function(transport) { if($('stateLdMsg')) $('stateLdMsg').hide(); ! if($('stateList')) ! $('stateList').show(); if($('stateStds')) $('stateStds').show(); ! }, ! onFailure: function(transport) { ! if($('stateLdMsg')) ! $('stateLdMsg').hide(); ! if($('stateList')) ! $('stateList').show(); ! } }); } Index: state_standards.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** state_standards.jsp 30 Apr 2007 23:21:01 -0000 1.1.2.1 --- state_standards.jsp 1 May 2007 20:38:02 -0000 1.1.2.2 *************** *** 49,71 **** <c:if test="${empty satAuthorsMap || param.reload == 'true'}"> ! <%-- Request the list of available states (authors) --%> ! <c:url value="http://lehnert.syr.edu:8080/casaa-rest/service.do" var="satRequest"> ! <c:param name="method" value="getAuthors"/> ! <c:param name="username" value="test"/> ! <c:param name="password" value="p"/> ! </c:url> ! <%-- Make SAT request and store the response --%> ! <c:import url="${satRequest}" charEncoding="UTF-8" var="satResponse"/> ! <x:parse var="satResults">${satResponse}</x:parse> ! ! <%-- Populate and cache a Map of states (authors) --%> ! <c:remove var="satAuthorsMap" scope="application" /> ! <jsp:useBean id="satAuthorsMap" class="java.util.TreeMap" scope="application" /> ! <x:forEach select="$satResults//SATWebService/Authors/Author"> ! <c:set var="author"><x:out select="."/></c:set> ! <c:if test="${author != 'ALL' && !fn:contains(author,'National') && !fn:contains(author,'American')}"> ! <c:set target="${satAuthorsMap}" property="${author}" value="${author}"/> ! </c:if> ! </x:forEach> </c:if> --- 49,73 ---- <c:if test="${empty satAuthorsMap || param.reload == 'true'}"> ! <c:catch var="satAuthorError"> ! <%-- Request the list of available states (authors) --%> ! <c:url value="http://lehnert.syr.edu:8080/casaa-rest/service.do" var="satRequest"> ! <c:param name="method" value="getAuthors"/> ! <c:param name="username" value="test"/> ! <c:param name="password" value="p"/> ! </c:url> ! <%-- Make SAT request and store the response --%> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 20000)}"/> ! <x:parse var="satResults">${satResponse}</x:parse> ! ! <%-- Populate and cache a Map of states (authors) --%> ! <c:remove var="satAuthorsMap" scope="application" /> ! <jsp:useBean id="satAuthorsMap" class="java.util.TreeMap" scope="application" /> ! <x:forEach select="$satResults//SATWebService/Authors/Author"> ! <c:set var="author"><x:out select="."/></c:set> ! <c:if test="${author != 'ALL' && !fn:contains(author,'National') && !fn:contains(author,'American')}"> ! <c:set target="${satAuthorsMap}" property="${author}" value="${author}"/> ! </c:if> ! </x:forEach> ! </c:catch> </c:if> *************** *** 97,103 **** </nobr> </form> - <div id="stateUpMsg" style="background: url('images/spinner.gif') no-repeat; padding-left:20; display:none" class="loadMsg"> - Loading <span id="selectedState"></span> standards associated with this resource... - </div> <div id="stateStds"> <c:choose> --- 99,102 ---- Index: state_standards_req_as_asn.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/Attic/state_standards_req_as_asn.jsp,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -r1.1.2.1 -r1.1.2.2 *** state_standards_req_as_asn.jsp 30 Apr 2007 23:21:01 -0000 1.1.2.1 --- state_standards_req_as_asn.jsp 1 May 2007 20:38:02 -0000 1.1.2.2 *************** *** 20,26 **** </c:url> ! ${f:systemOut(satRequest)} ! <%-- Make SAT request and store the response --%> ! <c:import url="${satRequest}" charEncoding="UTF-8" var="satResponse"/> <x:parse var="satResults">${satResponse}</x:parse> <c:set var="asnId"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Identifier"/></c:set> --- 20,29 ---- </c:url> ! <%-- Make SAT request and store the response. Timeout each request after waiting 8 seconds. --%> ! <c:catch var="timeOutExc"> ! <c:set var="satResponse" value="${f:timedImportUsingEncoding(satRequest, 'UTF-8', 8000)}"/> ! </c:catch> ! ${timeOutExc != null ? f:systemOut('Warning: SAT request timed out after 8 seconds. Some standards were not retrieved.') : ''} ! <x:parse var="satResults">${satResponse}</x:parse> <c:set var="asnId"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Identifier"/></c:set> *************** *** 38,42 **** </c:when> <c:otherwise> ! <ul><li>Dup ID found: ${asnId}</li></ul> </c:otherwise> </c:choose> --- 41,45 ---- </c:when> <c:otherwise> ! <%-- <ul><li>Dup ID found: ${asnId}</li></ul> --%> </c:otherwise> </c:choose> Index: view_annotation.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/view_annotation.jsp,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -C2 -r1.9.2.1 -r1.9.2.2 *** view_annotation.jsp 30 Apr 2007 23:21:01 -0000 1.9.2.1 --- view_annotation.jsp 1 May 2007 20:38:02 -0000 1.9.2.2 *************** *** 276,279 **** --- 276,280 ---- </td> <td valign="top" width="50%" style="padding-left:10"> + <%-- Display state standards using AJAX --%> <c:set var="state"> <c:choose> *************** *** 284,288 **** <%-- Inject the state standards using AJAX --%> <div id="stateLdMsg" style="background: url('images/spinner.gif') no-repeat; padding-left: 20px;" class="loadMsg"> ! Loading ${state} standards associated with this resource... </div> <div id="stateStandards"></div> --- 285,289 ---- <%-- Inject the state standards using AJAX --%> <div id="stateLdMsg" style="background: url('images/spinner.gif') no-repeat; padding-left: 20px;" class="loadMsg"> ! Loading <span id="stateName">${state}</span> standards associated with this resource... </div> <div id="stateStandards"></div> |
|
From: John W. <jwe...@us...> - 2007-04-30 23:21:07
|
Update of /cvsroot/dlese/web-view/web/includes In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv27774/web/includes Modified Files: Tag: standards-demo display_annos.jsp header.jsp setup.jsp Added Files: Tag: standards-demo TAGLibIncludes.jsp Log Message: Added state standards to the standards display page, with ability to select state from a list (uses SAT service to fetch NSES to state mappings) --- NEW FILE --- <%@ page language="java" %><%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%><%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %><%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %><%@ taglib uri="http://jakarta.apache.org/taglibs/xtags-1.0" prefix="xtags" %><%@ taglib prefix="f" uri="http://www.dlese.org/dpc/dds/tags/dleseELFunctions" %><%@ taglib uri="/WEB-INF/tlds/utils.tld" prefix="util" %><%@ taglib uri="/WEB-INF/tlds/dds.tld" prefix="dds" %><%@ taglib uri="/WEB-INF/tlds/response.tld" prefix="resp" %><%@ taglib uri="/WEB-INF/tlds/vocabulary_opml.tld" prefix="vocabs" %><%@ page isELIgnored="false" %> Index: display_annos.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/includes/display_annos.jsp,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -C2 -r1.23 -r1.23.2.1 *** display_annos.jsp 6 Sep 2006 21:41:35 -0000 1.23 --- display_annos.jsp 30 Apr 2007 23:21:01 -0000 1.23.2.1 *************** *** 32,45 **** <xtags:forEach context="<%= vocabOPML %>" select="opml/body/outline"> <c:choose> ! <c:when test="${stText == 'empty'}"> ! <c:set var="stText"> ! <xtags:valueOf select="@text"/> ! </c:set> ! </c:when> ! <c:otherwise> ! <c:set var="stText"> ! <c:out value="${stText}"/>, <xtags:valueOf select="@text"/> ! </c:set> ! </c:otherwise> </c:choose> --- 32,48 ---- <xtags:forEach context="<%= vocabOPML %>" select="opml/body/outline"> <c:choose> ! <c:when test="${stText == 'empty'}"> ! <c:set var="stText"> ! <xtags:valueOf select="@text"/> ! </c:set> ! <c:if test="${stText == 'National Science Education Standards (NSES)'}"> ! <c:set var="stText" value="National and State Education Standards"/> ! </c:if> ! </c:when> ! <c:otherwise> ! <c:set var="stText"> ! <c:out value="${stText}"/>, <xtags:valueOf select="@text"/> ! </c:set> ! </c:otherwise> </c:choose> Index: header.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/includes/header.jsp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -r1.7 -r1.7.2.1 *** header.jsp 15 Sep 2006 16:54:32 -0000 1.7 --- header.jsp 30 Apr 2007 23:21:01 -0000 1.7.2.1 *************** *** 20,23 **** --- 20,25 ---- <script type="text/javascript" src="/dlese_shared/async.js"></script> <script type='text/javascript' src='/library/choosing_using.js'></script> + <script type='text/javascript' src='/library/prototype.js'></script> + <script type='text/javascript' src='/library/state_standards.js'></script> Index: setup.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/includes/setup.jsp,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -r1.11 -r1.11.2.1 *** setup.jsp 13 Sep 2006 00:06:05 -0000 1.11 --- setup.jsp 30 Apr 2007 23:21:01 -0000 1.11.2.1 *************** *** 1,14 **** ! <%@ page language="java" %><%@ ! taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%><%@ ! taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %><%@ ! taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %><%@ ! taglib uri="http://jakarta.apache.org/taglibs/xtags-1.0" prefix="xtags" %><%@ ! taglib prefix="f" uri="http://www.dlese.org/dpc/dds/tags/dleseELFunctions" %><%@ ! taglib uri="/WEB-INF/tlds/utils.tld" prefix="util" %><%@ ! taglib uri="/WEB-INF/tlds/dds.tld" prefix="dds" %><%@ ! taglib uri="/WEB-INF/tlds/response.tld" prefix="resp" %><%@ ! taglib uri="/WEB-INF/tlds/vocabulary_opml.tld" prefix="vocabs" %><%@ ! page isELIgnored="false" ! %><%-- Set ${domain} so as to reference a *local* copy of /dlese_shared/ (or anything else) --%><c:set var="domain"><%= "http://" + request.getServerName() + ":" + request.getServerPort() %></c:set> <resp:setContentType>text/html</resp:setContentType> --- 1,4 ---- ! <%@ include file="/includes/TAGLibIncludes.jsp" %> ! <%-- Set ${domain} so as to reference a *local* copy of /dlese_shared/ (or anything else) --%><c:set var="domain"><%= "http://" + request.getServerName() + ":" + request.getServerPort() %></c:set> <resp:setContentType>text/html</resp:setContentType> |
|
From: John W. <jwe...@us...> - 2007-04-30 23:21:07
|
Update of /cvsroot/dlese/web-view/web In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv27774/web Modified Files: Tag: standards-demo discovery_styles_screen.css view_annotation.jsp Added Files: Tag: standards-demo prototype.js state_standards.js state_standards.jsp state_standards_req_as_asn.jsp state_standards_req_as_text.jsp Log Message: Added state standards to the standards display page, with ability to select state from a list (uses SAT service to fetch NSES to state mappings) --- NEW FILE --- /* Prototype JavaScript framework, version 1.5.0 * (c) 2005-2007 Sam Stephenson * * Prototype is freely distributable under the terms of an MIT-style license. * For details, see the Prototype web site: http://prototype.conio.net/ * /*--------------------------------------------------------------------------*/ var Prototype = { Version: '1.5.0', BrowserFeatures: { XPath: !!document.evaluate }, ScriptFragment: '(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)', emptyFunction: function() {}, K: function(x) { return x } } [...2476 lines suppressed...] // Safari returns margins on body which is incorrect if the child is absolutely // positioned. For performance reasons, redefine Position.cumulativeOffset for // KHTML/WebKit only. if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) { Position.cumulativeOffset = function(element) { var valueT = 0, valueL = 0; do { valueT += element.offsetTop || 0; valueL += element.offsetLeft || 0; if (element.offsetParent == document.body) if (Element.getStyle(element, 'position') == 'absolute') break; element = element.offsetParent; } while (element); return [valueL, valueT]; } } Element.addMethods(); --- NEW FILE --- Event.observe(window, 'load', onPageLoad, false); var parms = window.location.search.parseQuery(); function onPageLoad() { selectState(parms.id); } function selectState(id,state) { if($('stateStds')) $('stateStds').hide(); if($('stateUpMsg')) { var selectedState = $('selectedState'); if(state && state != 'NONE' && selectedState) selectedState.update(' ' + state + ' '); else if(selectedState) selectedState.update(' '); $('stateUpMsg').show(); } if($('stateStandards')) { if(state) var p = { id: id, locStd: state } else var p = { id: id } new Ajax.Updater('stateStandards', 'state_standards.jsp', { parameters: p, onSuccess: function() { if($('stateLdMsg')) $('stateLdMsg').hide(); if($('stateUpMsg')) $('stateUpMsg').hide(); if($('stateStds')) $('stateStds').show(); } }); } } --- NEW FILE --- <%@ include file="/includes/TAGLibIncludes.jsp" %> <c:set var="lowestGrade" value="13"/> <c:set var="highestGrade" value="-1"/> <c:set var="newLow" value="13"/> <c:set var="newHigh" value="-1"/> <c:catch var="serviceError"> <c:catch var="serviceError"> <c:url value="${initParam.webServiceBaseUrl}" var="webServiceRequest"> <c:param name="verb" value="GetRecord"/> <c:param name="id" value="${param.id}"/> <c:param name="xmlFormat" value="nsdl_dc"/> </c:url> </c:catch> <xtags:parse url="${webServiceRequest}" id="desc"/> <xtags:parse> <xtags:style document="<%= desc %>" xsl="/includes/remove_namespace.xsl"/> </xtags:parse> <%-- Grab grade range info --%> <xtags:forEach select="DDSWebService/GetRecord/record/head/additionalMetadata/adn/renderingGuidelines/gradeRangeOPML/opml/body/outline" id="grOPML"> <c:set var="grText"><xtags:valueOf context="<%= grOPML %>" select="@groups:vocab"/></c:set> <c:set var="grText" value="${fn:trim(grText)}"/> <c:choose> <c:when test="${grText == 'DLESE:Primary elementary'}"> <c:set var="newLow" value="0"/> <c:set var="newHigh" value="2"/> </c:when> <c:when test="${grText == 'DLESE:Intermediate elementary'}"> <c:set var="newLow" value="3"/> <c:set var="newHigh" value="5"/> </c:when> <c:when test="${grText == 'DLESE:Middle school'}"> <c:set var="newLow" value="6"/> <c:set var="newHigh" value="8"/> </c:when> <c:when test="${grText == 'DLESE:High school'}"> <c:set var="newLow" value="9"/> <c:set var="newHigh" value="12"/> </c:when> </c:choose> <%-- Determine the highest and lowest grade cataloged for this resource --%> <c:set var="lowestGrade" value="${newLow+0 < lowestGrade+0 ? newLow : lowestGrade}"/> <c:set var="highestGrade" value="${newHigh+0 > highestGrade+0 ? newHigh : highestGrade}"/> </xtags:forEach> </c:catch> <c:set var="error"> <xtags:valueOf select="DDSWebService/error"/> </c:set> <c:if test="${empty satAuthorsMap || param.reload == 'true'}"> <%-- Request the list of available states (authors) --%> <c:url value="http://lehnert.syr.edu:8080/casaa-rest/service.do" var="satRequest"> <c:param name="method" value="getAuthors"/> <c:param name="username" value="test"/> <c:param name="password" value="p"/> </c:url> <%-- Make SAT request and store the response --%> <c:import url="${satRequest}" charEncoding="UTF-8" var="satResponse"/> <x:parse var="satResults">${satResponse}</x:parse> <%-- Populate and cache a Map of states (authors) --%> <c:remove var="satAuthorsMap" scope="application" /> <jsp:useBean id="satAuthorsMap" class="java.util.TreeMap" scope="application" /> <x:forEach select="$satResults//SATWebService/Authors/Author"> <c:set var="author"><x:out select="."/></c:set> <c:if test="${author != 'ALL' && !fn:contains(author,'National') && !fn:contains(author,'American')}"> <c:set target="${satAuthorsMap}" property="${author}" value="${author}"/> </c:if> </x:forEach> </c:if> <div class="dlese_vocabs_tab_indented"> <%-- Grab the standards text to send to SAT service --%> <c:catch var="satError"> <c:set var="selectedState" scope="session"> <c:choose> <c:when test="${not empty param.locStd}">${param.locStd}</c:when> <c:when test="${not empty selectedState}">${selectedState}</c:when> <c:otherwise>NONE</c:otherwise> </c:choose> </c:set> <form action="" method="get" id="stateList" style="padding:0; margin:0; padding-bottom:10"> <nobr> Show standards for: <select name="locStd" onChange="selectState(parms.id,$F(this))"> <option value="NONE">-- Select a State --</option> <c:forEach items="${satAuthorsMap}" var="author"> <option value="${author.key}" ${selectedState == author.key ? 'selected' : ''}>${author.key}</option> </c:forEach> </select> <input type="hidden" value="${param.id}" name="id"/> <input type="hidden" value="${param.type}" name="type"/> <input type="hidden" value="${param.other}" name="other"/> </nobr> </form> <div id="stateUpMsg" style="background: url('images/spinner.gif') no-repeat; padding-left:20; display:none" class="loadMsg"> Loading <span id="selectedState"></span> standards associated with this resource... </div> <div id="stateStds"> <c:choose> <c:when test="${selectedState != 'NONE'}"> <%-- Create a HashMap to de-dup the standards that are displayed --%> <jsp:useBean id="standardsMap" class="java.util.HashMap" scope="page" /> <span class="dlese_vocabs_top_level_header">${selectedState} Educational Standards</span>: <c:set var="hasStateStandards" value="false"/> <%-- Search for aligned standards by either ASN ID (preferred) or NSES text --%> <%@ include file="state_standards_req_as_asn.jsp" %> <%-- <%@ include file="state_standards_req_as_text.jsp" %> --%> </c:when> <c:otherwise> <div class="loadMsg"> Choose a state from the list above to view associated standards for this resource. </div> </c:otherwise> </c:choose> </c:catch> <c:choose> <c:when test="${not empty satError}"> <div style="padding-top:10"> We were unable to retrieve the standards information at this time. Please try again later. <!-- An error occured while processing the following SAT Web service request: ${satRequest} Error message: ${satError} SAT Response: ${satResponse} --> </div> </c:when> <c:when test="${hasStateStandards == 'false'}"> <div style="padding-top:10"> No standards are available. </div> </c:when> </c:choose> </div> </div> --- NEW FILE --- <%-- Option 1: Search for aligned standards by ASN ID --%> <xtags:forEach select="DDSWebService/GetRecord/record/metadata/nsdl_dc/conformsTo" id="csASN"> <c:set var="asn_ID"><xtags:valueOf context="<%= csASN %>" select="."/></c:set> <%-- ${f:systemOut(asn_ID)} ${f:systemOut('')} --%> <%-- ${f:systemOut(csNodes[4])} --%> <c:url value="http://lehnert.syr.edu:8080/casaa-rest/service.do" var="satRequest"> <c:param name="method" value="suggestStandards"/> <c:param name="author" value="${selectedState}"/> <c:param name="maxResults" value="1"/> <c:param name="username" value="test"/> <c:param name="password" value="p"/> <c:param name="query" value="${asn_ID}"/> <c:if test="${lowestGrade+0 <= 13}"> <c:param name="startGrade" value="${lowestGrade}"/> </c:if> <c:if test="${highestGrade+0 >= 0}"> <c:param name="endGrade" value="${highestGrade}"/> </c:if> </c:url> ${f:systemOut(satRequest)} <%-- Make SAT request and store the response --%> <c:import url="${satRequest}" charEncoding="UTF-8" var="satResponse"/> <x:parse var="satResults">${satResponse}</x:parse> <c:set var="asnId"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Identifier"/></c:set> <c:if test="${not empty asnId}"><c:set var="hasStateStandards" value="true"/></c:if> <c:choose> <c:when test="${empty standardsMap[asnId]}"> <c:set target="${standardsMap}" property="${asnId}" value="${asnId}"/> <ul> <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Text"/></li> <ul> <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Benchmark"/></li> <%-- <li>(<a href="${satRequest}" target="_blank">SAT request</a>)</li> --%> </ul> </ul> </c:when> <c:otherwise> <ul><li>Dup ID found: ${asnId}</li></ul> </c:otherwise> </c:choose> </xtags:forEach> --- NEW FILE --- <%-- Option 2: Search for aligned standards by using NSES text --%> <xtags:forEach select="DDSWebService/GetRecord/record/head/additionalMetadata/adn/renderingGuidelines/contentStandardOPML/opml/body/outline/outline/outline" id="csOPML"> <c:set var="csText"><xtags:valueOf context="<%= csOPML %>" select="outline/outline/@groups:vocab"/></c:set> <%-- ${f:systemOut(csText)} ${f:systemOut('')} --%> <c:set var="csNodes" value="${fn:split(csText,':')}"/> <%-- Perform the request only if we have a 4th level NSES leaf node --%> <c:if test="${fn:length(csNodes) == 5}"> <%-- ${f:systemOut(csNodes[4])} --%> <c:url value="http://lehnert.syr.edu:8080/casaa-rest/service.do" var="satRequest"> <c:param name="method" value="suggestStandards"/> <c:param name="author" value="${selectedState}"/> <c:param name="maxResults" value="1"/> <c:param name="username" value="test"/> <c:param name="password" value="p"/> <c:param name="query" value="${csNodes[4]}"/> <c:if test="${lowestGrade+0 <= 13}"> <c:param name="startGrade" value="${lowestGrade}"/> </c:if> <c:if test="${highestGrade+0 >= 0}"> <c:param name="endGrade" value="${highestGrade}"/> </c:if> </c:url> ${f:systemOut(satRequest)} <%-- Make SAT request and store the response --%> <c:import url="${satRequest}" charEncoding="UTF-8" var="satResponse"/> <x:parse var="satResults">${satResponse}</x:parse> <c:set var="asnId"><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Identifier"/></c:set> <c:if test="${not empty asnId}"><c:set var="hasStateStandards" value="true"/></c:if> <c:choose> <c:when test="${empty standardsMap[asnId]}"> <c:set target="${standardsMap}" property="${asnId}" value="${asnId}"/> <ul> <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Text"/></li> <ul> <li><x:out select="$satResults//SATWebService/SuggestedStandards/Results/Standard/Benchmark"/></li> <%-- <li>(<a href="${satRequest}" target="_blank">SAT request</a>)</li> --%> </ul> </ul> </c:when> <c:otherwise> <%-- <ul><li>Dup ID found: ${asnId}</li></ul> --%> </c:otherwise> </c:choose> </c:if> </xtags:forEach> Index: discovery_styles_screen.css =================================================================== RCS file: /cvsroot/dlese/web-view/web/discovery_styles_screen.css,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -C2 -r1.16 -r1.16.2.1 *** discovery_styles_screen.css 26 Jun 2006 22:37:15 -0000 1.16 --- discovery_styles_screen.css 30 Apr 2007 23:21:01 -0000 1.16.2.1 *************** *** 284,286 **** --- 284,291 ---- z-index: 9999; } + .loadMsg { + font-size: 1.0em; + font-weight: normal; + color: #555555; + } Index: view_annotation.jsp =================================================================== RCS file: /cvsroot/dlese/web-view/web/view_annotation.jsp,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -r1.9 -r1.9.2.1 *** view_annotation.jsp 3 Jul 2006 16:10:52 -0000 1.9 --- view_annotation.jsp 30 Apr 2007 23:21:01 -0000 1.9.2.1 *************** *** 1,198 **** ! <%@ include file="/includes/setup.jsp" %> ! ! <jsp:useBean id="webQueryForm" class="org.dlese.dpc.web.action.form.WebQueryForm" scope="session"/> ! ! <%@ page import="java.util.Enumeration" %> ! ! <dds:setKeywordsHighlight keywords="${ webQueryForm.keywords }" highlightColor="#000099" /> ! ! <%-- tell the web_service_connection.jsp page that it is being called from the Annotation Details page. --%> ! <c:set var="annoDetailsPage" value="true"/> ! <%@ include file="/includes/web_service_connection.jsp" %> ! <c:catch var="serviceError"> ! <xtags:parse url="${webServiceRequest}" id="annoDetails"/> ! <xtags:parse> ! <xtags:style document="<%= annoDetails %>" xsl="/includes/remove_namespace.xsl"/> ! </xtags:parse> ! </c:catch> ! <c:set var="error"> ! <xtags:valueOf select="DDSWebService/error"/> ! </c:set> ! <html> ! <head> ! ! <c:choose> ! <c:when test="${not empty error}"> ! <title>No information is available for record ID <c:out value="${param.id}"/>.</title> ! </c:when> ! <c:otherwise> ! <title>Choosing & using '<xtags:valueOf select="DDSWebService/GetRecord/record/metadata ! /itemRecord/general/title"/>'</title> ! </c:otherwise> ! </c:choose> ! </title> ! <%@ include file="/includes/header.jsp" %> ! ! <style type="text/css"> ! .dlese_vocabs_top_level_header { font-weight: bold; } ! </style> ! </head> ! <body> ! <%@ include file="/includes/search_banner.jsp" %> ! <div class="dlese_sectionTitle" id="dlese_sectionTitle"> ! Find a<br />Resource ! </div> ! ! <div class="breadcrumbs"> ! <div class="breadcrumbsText">Educational resources > Find a resource > Choosing & Using</div> ! </div> ! ! ! ! ! <table border="0" cellspacing="0" cellpadding="2" width="100%" hspace="0"> ! <tr> ! <td> ! <nobr> </nobr> ! </td> ! </tr> ! <tr class='dlese_blue'> ! <td style="padding-left: 8px;"> ! <b> <c:choose> ! <c:when test="${param.type == 'standards'}"> ! Educational Standards associated with ! </c:when> ! ! <c:when test="${param.type == 'tt'}"> ! Teaching Tips and Comments given for ! </c:when> ! <c:when test="${param.type == 'summary'}"> ! Summary given for ! </c:when> ! <c:when test="${param.type == 'special'}"> ! Meeting special needs given for ! </c:when> ! <c:when test="${param.type == 'scores'}"> ! Score given for ! </c:when> ! <c:when test="${param.type == 'review'}"> ! General review given for ! </c:when> ! <c:when test="${param.type == 'skills'}"> ! Skill given for ! </c:when> ! <c:when test="${param.type == 'assess'}"> ! Assessment given for ! </c:when> ! <c:when test="${param.type == 'miscon'}"> ! Misconception given for ! </c:when> ! <c:when test="${param.type == 'example'}"> ! Example given for ! </c:when> ! <c:when test="${param.type == 'related'}"> ! Related resource for ! </c:when> ! </c:choose></b> ! <c:set var="title"> ! <xtags:valueOf select="DDSWebService/GetRecord/record/metadata/itemRecord/general/title"/> ! </c:set> ! <c:set var="myId"> ! <c:out value="${param.id}"/> ! </c:set> ! <c:set var="resourceURL"> ! <xtags:valueOf select="DDSWebService/GetRecord/record/metadata/itemRecord/technical/online/primaryURL"/> ! </c:set> ! <c:set var="redirectURL"> ! <c:choose> ! <c:when test="${not empty initParam.redirectBaseUrl}"> ! ${initParam.redirectBaseUrl}/T=view-annotation&ID=${myId}*${resourceURL} ! </c:when> ! <c:otherwise> ! ${resourceURL} ! </c:otherwise> ! </c:choose> ! </c:set> ! <a href='${redirectURL}' title="View this resource in a new window" ! target="_blank" class="headers" style='font-weight: bold; text-decoration: none; color: #000099;'> ! <c:out value="${title}"/> ! </a> ! ! ! </td> ! ! </tr> ! <tr> ! ! <tr> ! <td> ! <c:choose> ! <c:when test="${param.type == 'standards'}"> ! ! <c:set var="vocabOPML"><xtags:copyOf select="DDSWebService/GetRecord/record/head/additionalMetadata/adn/renderingGuidelines/contentStandardOPML/opml"/></c:set> ! <c:if test="${ not empty vocabOPML }"> ! <c:catch var="xslError"> ! <c:import var="transformXsl" url="includes/vocabs_tab_indented.xsl" /> ! <x:transform xml="${ vocabOPML }" xslt="${ transformXsl }" /> ! </c:catch> ! <c:if test="not empty $xslError"> ! <!-- $xslError --> ! </c:if> ! </c:if> ! ! <c:if test="${param.other == 'true'}"> ! ! <c:set var="stHeading" value="0"/> ! <xtags:variable select="DDSWebService/GetRecord/record/head/additionalMetadata/adn" type="node" id="adnAdditional"/> ! <xtags:forEach context="<%= adnAdditional %>" select="annotatedBy/record/metadata/annotationRecord" id="annotation"> ! <c:set var="annoId"> ! <xtags:valueOf context="<%= annotation %>" select="service/recordID"/> ! </c:set> ! <c:set var="annoType"> ! <xtags:valueOf context="<%= annotation %>" select="annotation/type"/> ! </c:set> ! <c:if test="${annoType == 'Educational standard'}"> ! ! <c:if test="${stHeading == '0'}"> ! <div class="descHeader">Other educational standards: </div> ! <c:set var="stHeading" value="1"/> ! </c:if> ! ! <div class="desc"><xtags:valueOf context="<%= annotation %>" select="annotation/content/description"/></div> ! <c:set var="url"> ! <xtags:valueOf context="<%= annotation %>" select="annotation/content/url"/> ! </c:set> ! <c:set var="contexturl"> ! <xtags:valueOf context="<%= annotation %>" select="annotation/context"/> ! </c:set> ! <c:if test="${not empty url}"> ! <div class="desc"><i>More</i>: <a href='${url}' target="_blank"><c:out value="${url}"/></a></div> ! </c:if> ! <c:if test="${not empty contexturl}"> ! <div class="desc"><i>Take a shortcut to the relevant page in the resource</i>: <a href='${contexturl}' target="_blank"><c:out value="${contexturl}"/></a></div> ! ! </c:if> ! <p> ! </c:if> ! ! </xtags:forEach> ! </c:if> ! ! </c:when> ! <c:otherwise> ! <%@ include file="includes/anno_desc_display.jsp" %> ! </c:otherwise> ! </c:choose> ! ! </td> ! </tr> ! </table> ! ! ! ! ! ! <%-- DLESE template bottom (footer links and logo) --%> ! <c:import url="${domain}/dlese_shared/templates/content_bottom.html"/> ! </body> </html> \ No newline at end of file --- 1,410 ---- ! <%@ include file="/includes/setup.jsp" %> ! ! <jsp:useBean id="webQueryForm" class="org.dlese.dpc.web.action.form.WebQueryForm" scope="session"/> ! ! ! ! <%@ page import="java.util.Enumeration" %> ! ! ! ! <dds:setKeywordsHighlight keywords="${ webQueryForm.keywords }" highlightColor="#000099" /> ! ! ! ! <%-- tell the web_service_connection.jsp page that it is being called from the Annotation Details page. --%> ! ! <c:set var="annoDetailsPage" value="true"/> ! ! <%@ include file="/includes/web_service_connection.jsp" %> ! ! <c:catch var="serviceError"> ! ! <xtags:parse url="${webServiceRequest}" id="annoDetails"/> ! ! <xtags:parse> ! ! <xtags:style document="<%= annoDetails %>" xsl="/includes/remove_namespace.xsl"/> ! ! </xtags:parse> ! ! </c:catch> ! ! <c:set var="error"> ! ! <xtags:valueOf select="DDSWebService/error"/> ! ! </c:set> ! ! <html> ! ! <head> ! ! ! ! <c:choose> ! ! <c:when test="${not empty error}"> ! ! <title>No information is available for record ID <c:out value="${param.id}"/>.</title> ! ! </c:when> ! ! <c:otherwise> ! ! <title>Choosing & using '<xtags:valueOf select="DDSWebService/GetRecord/record/metadata ! ! /itemRecord/general/title"/>'</title> ! ! </c:otherwise> ! ! </c:choose> ! ! </title> ! ! <%@ include file="/includes/header.jsp" %> ! ! ! ! <style type="text/css"> ! ! .dlese_vocabs_top_level_header { font-weight: bold; } ! ! </style> ! ! </head> ! ! <body> ! ! <%@ include file="/includes/search_banner.jsp" %> ! ! <div class="dlese_sectionTitle" id="dlese_sectionTitle"> ! ! Find a<br />Resource ! ! </div> ! ! ! ! <div class="breadcrumbs"> ! ! <div class="breadcrumbsText">Educational resources > Find a resource > Choosing & Using</div> ! ! </div> ! ! ! ! ! ! ! ! ! ! <table border="0" cellspacing="0" cellpadding="2" width="100%" hspace="0"> ! ! <tr> ! ! <td> ! ! <nobr> </nobr> ! ! </td> ! ! </tr> ! ! <tr class='dlese_blue'> ! ! <td style="padding-left: 8px;"> ! ! <b> <c:choose> ! ! <c:when test="${param.type == 'standards'}"> ! ! Educational Standards associated with ! ! </c:when> ! ! ! ! <c:when test="${param.type == 'tt'}"> ! ! Teaching Tips and Comments given for ! ! </c:when> ! ! <c:when test="${param.type == 'summary'}"> ! ! Summary given for ! ! </c:when> ! ! <c:when test="${param.type == 'special'}"> ! ! Meeting special needs given for ! ! </c:when> ! ! <c:when test="${param.type == 'scores'}"> ! ! Score given for ! ! </c:when> ! ! <c:when test="${param.type == 'review'}"> ! ! General review given for ! ! </c:when> ! ! <c:when test="${param.type == 'skills'}"> ! ! Skill given for ! ! </c:when> ! ! <c:when test="${param.type == 'assess'}"> ! ! Assessment given for ! ! </c:when> ! ! <c:when test="${param.type == 'miscon'}"> ! ! Misconception given for ! ! </c:when> ! ! <c:when test="${param.type == 'example'}"> ! ! Example given for ! ! </c:when> ! ! <c:when test="${param.type == 'related'}"> ! ! Related resource for ! ! </c:when> ! ! </c:choose></b> ! ! <c:set var="title"> ! ! <xtags:valueOf select="DDSWebService/GetRecord/record/metadata/itemRecord/general/title"/> ! ! </c:set> ! ! <c:set var="myId"> ! ! <c:out value="${param.id}"/> ! ! </c:set> ! ! <c:set var="resourceURL"> ! ! <xtags:valueOf select="DDSWebService/GetRecord/record/metadata/itemRecord/technical/online/primaryURL"/> ! ! </c:set> ! ! <c:set var="redirectURL"> ! ! <c:choose> ! ! <c:when test="${not empty initParam.redirectBaseUrl}"> ! ! ${initParam.redirectBaseUrl}/T=view-annotation&ID=${myId}*${resourceURL} ! ! </c:when> ! ! <c:otherwise> ! ! ${resourceURL} ! ! </c:otherwise> ! ! </c:choose> ! ! </c:set> ! ! <a href='${redirectURL}' title="View this resource in a new window" ! ! target="_blank" class="headers" style='font-weight: bold; text-decoration: none; color: #000099;'> ! ! <c:out value="${title}"/> ! ! </a> ! ! ! ! ! ! </td> ! ! ! ! </tr> ! ! <tr> ! ! ! ! <tr> ! ! <td> ! ! <c:choose> ! ! <c:when test="${param.type == 'standards'}"> ! ! ! ! <c:set var="vocabOPML"><xtags:copyOf select="DDSWebService/GetRecord/record/head/additionalMetadata/adn/renderingGuidelines/contentStandardOPML/opml"/></c:set> ! ! <c:if test="${ not empty vocabOPML }"> ! <table style="" valign="top"> ! <tr> ! <td valign="top" width="50%" style="padding-right:5"> ! <%-- Display national standards in the usual DLESE way... --%> ! <c:catch var="xslError"> ! <c:import var="transformXsl" url="includes/vocabs_tab_indented.xsl" /> ! <x:transform xml="${ vocabOPML }" xslt="${ transformXsl }" /> ! </c:catch> ! ! <c:if test="${not empty xslError}"> ! <!-- ${xslError} --> ! </c:if> ! </td> ! <td valign="top" width="50%" style="padding-left:10"> ! <c:set var="state"> ! <c:choose> ! <c:when test="${not empty selectedState && selectedState != 'NONE'}">${selectedState}</c:when> ! <c:otherwise>state</c:otherwise> ! </c:choose> ! </c:set> ! <%-- Inject the state standards using AJAX --%> ! <div id="stateLdMsg" style="background: url('images/spinner.gif') no-repeat; padding-left: 20px;" class="loadMsg"> ! Loading ${state} standards associated with this resource... ! </div> ! <div id="stateStandards"></div> ! ! </td> ! </tr> ! </table> ! ! ! </c:if> ! ! ! ! ! <c:if test="${param.other == 'true'}"> ! ! ! ! <c:set var="stHeading" value="0"/> ! ! <xtags:variable select="DDSWebService/GetRecord/record/head/additionalMetadata/adn" type="node" id="adnAdditional"/> ! ! <xtags:forEach context="<%= adnAdditional %>" select="annotatedBy/record/metadata/annotationRecord" id="annotation"> ! ! <c:set var="annoId"> ! ! <xtags:valueOf context="<%= annotation %>" select="service/recordID"/> ! ! </c:set> ! ! <c:set var="annoType"> ! ! <xtags:valueOf context="<%= annotation %>" select="annotation/type"/> ! ! </c:set> ! ! <c:if test="${annoType == 'Educational standard'}"> ! ! ! ! <c:if test="${stHeading == '0'}"> ! ! <div class="descHeader">Other educational standards: </div> ! ! <c:set var="stHeading" value="1"/> ! ! </c:if> ! ! ! ! <div class="desc"><xtags:valueOf context="<%= annotation %>" select="annotation/content/description"/></div> ! ! <c:set var="url"> ! ! <xtags:valueOf context="<%= annotation %>" select="annotation/content/url"/> ! ! </c:set> ! ! <c:set var="contexturl"> ! ! <xtags:valueOf context="<%= annotation %>" select="annotation/context"/> ! ! </c:set> ! ! <c:if test="${not empty url}"> ! ! <div class="desc"><i>More</i>: <a href='${url}' target="_blank"><c:out value="${url}"/></a></div> ! ! </c:if> ! ! <c:if test="${not empty contexturl}"> ! ! <div class="desc"><i>Take a shortcut to the relevant page in the resource</i>: <a href='${contexturl}' target="_blank"><c:out value="${contexturl}"/></a></div> ! ! ! ! </c:if> ! ! <p> ! ! </c:if> ! ! ! ! </xtags:forEach> ! ! </c:if> ! ! ! ! </c:when> ! ! <c:otherwise> ! ! <%@ include file="includes/anno_desc_display.jsp" %> ! ! </c:otherwise> ! ! </c:choose> ! ! ! ! </td> ! ! </tr> ! ! </table> ! ! ! ! ! ! ! ! ! ! ! ! <%-- DLESE template bottom (footer links and logo) --%> ! ! <c:import url="${domain}/dlese_shared/templates/content_bottom.html"/> ! ! </body> ! </html> \ No newline at end of file |
