Changeset 7544

Timestamp:

03/24/09 13:30:56 (16 months ago)

Author:

josowski

Message:

Removing date functionality from PLoS templates

References #1225, also removing some config file changes that inadvertanly got commited in r7543

Location:

head/ambra/webapp/src/main

Files:

• java/org/topazproject/ambra/search/action/SearchAction.java (modified) (1 diff)
• resources/ehcache.xml (modified) (1 diff)
• resources/freemarker.properties (modified) (1 diff)
• webapp/javascript/advsearch.js (modified) (2 diffs)
• webapp/search/searchStart.ftl (modified) (8 diffs)

head/ambra/webapp/src/main/java/org/topazproject/ambra/search/action/SearchAction.java

@@ -270 +270 @@
           cal.add(Calendar.MONTH, -3);
         }
+        if ("6months".equals(dateTypeSelect)) {
+          cal.add(Calendar.MONTH, -6);
+        }
 
         synchronized(luceneDateFormat) {

head/ambra/webapp/src/main/resources/ehcache.xml

@@ -116 +116 @@
             properties="peerDiscovery=automatic,
                         multicastGroupAddress=230.0.0.1,
-                        multicastGroupPort=6666"/>
+                        multicastGroupPort=4446"/>
 
 

head/ambra/webapp/src/main/resources/freemarker.properties

@@ -22 +22 @@
 template_exception_handler=rethrow 
 time_zone="UTC"
-template_update_delay=0
+template_update_delay=600
 localized_lookup=false
 cache_storage=strong:350, soft

head/ambra/webapp/src/main/webapp/javascript/advsearch.js

@@ -58 +58 @@
     ambra.advsearch.liAuthNmesOpts = dojo.byId(ambra.advsearch.Config.idLiAuthNmesOpts);
 
-    // dates section...
-    var slct = dojo.byId(ambra.advsearch.Config.idPublishDate);
-    var showDates = (slct.options[slct.selectedIndex].value == 'range');
-    dojo.byId(ambra.advsearch.Config.idPubDateOptions).style.display = showDates ? '' : 'none';
-    dojo.connect(dojo.byId(ambra.advsearch.Config.idPublishDate), "onchange", ambra.advsearch.onChangePublishDate);
-
-    // date part comment cue event bindings...
-    dojo.connect(dojo.byId('startDateId'), "onfocus", ambra.advsearch.onFocusCommentCueInputHandler);
-    dojo.connect(dojo.byId('endDateId'), "onfocus", ambra.advsearch.onFocusCommentCueInputHandler);
-
+
+    //Manage date entry section, but only if is defined
+    if (dojo.byId(ambra.advsearch.Config.idPubDateOptions) != null) {
+      var slct = dojo.byId(ambra.advsearch.Config.idPublishDate);
+      var showDates = (slct.options[slct.selectedIndex].value == 'range');
+      dojo.byId(ambra.advsearch.Config.idPubDateOptions).style.display = showDates ? '' : 'none';
+      dojo.connect(dojo.byId(ambra.advsearch.Config.idPublishDate), "onchange", ambra.advsearch.onChangePublishDate);
+
+      // date part comment cue event bindings...
+      dojo.connect(dojo.byId('startDateId'), "onfocus", ambra.advsearch.onFocusCommentCueInputHandler);
+      dojo.connect(dojo.byId('endDateId'), "onfocus", ambra.advsearch.onFocusCommentCueInputHandler);
+    }
 
     // subject categories section...
@@ -88 +90 @@
     ambra.advsearch.explodeAuthNames();
 
-    //  Prime the startDate and endDate pop-up calendars...
-    Calendar.setup({
-      inputField     :    "startDateId",    // id of the input field
-      ifFormat       :    "%Y-%m-%d",       // format of the input field
-      step           :    1                // show all years in drop-down boxes (instead of every other year as default)
-    });
-    Calendar.setup({
-      inputField     :    "endDateId",      // id of the input field
-      ifFormat       :    "%Y-%m-%d",       // format of the input field
-      step           :    1                // show all years in drop-down boxes (instead of every other year as default)
-    });
+    //Prime the startDate and endDate pop-up calendars only if they are defined 
+    if (dojo.byId(ambra.advsearch.Config.idPubDateOptions) != null) {
+      Calendar.setup({
+        inputField     :    "startDateId",    // id of the input field
+        ifFormat       :    "%Y-%m-%d",       // format of the input field
+        step           :    1                // show all years in drop-down boxes (instead of every other year as default)
+      });
+      Calendar.setup({
+        inputField     :    "endDateId",      // id of the input field
+        ifFormat       :    "%Y-%m-%d",       // format of the input field
+        step           :    1                // show all years in drop-down boxes (instead of every other year as default)
+      });
+    }
   },
 

head/ambra/webapp/src/main/webapp/search/searchStart.ftl

@@ -2 +2 @@
   $HeadURL::                                                                            $
   $Id$
-  
+
   Copyright (c) 2007-2009 by Topaz, Inc.
   http://topazproject.org
-  
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -24 +24 @@
 <#macro chkdlist tstr strlist><#list strlist as str><#if tstr == str>${checkedstr}</#if></#list></#macro>
 <!-- begin : advanced search form -->
-<div id="content" class="search">  
+<div id="content" class="search">
   <!-- begin : right-hand column -->
   <div id="rhc">
@@ -48 +48 @@
           <li class="btnWrap"><input type="submit" id="button-find" value="Go"/></li>
         </ol>
-      </form>              
+      </form>
     </div>-->
   </div>
@@ -58 +58 @@
     <p>Search the full text of all issues of <em>${currentJournalName}</em></p>
     <@s.url id="advSearchURL" includeParams="none" namespace="/search" action="advancedSearch" />
-    <form id="advSearchForm" name="advSearchForm" onsubmit="return true;" action="${advSearchURL}" 
+    <form id="advSearchForm" name="advSearchForm" onsubmit="return true;" action="${advSearchURL}"
           method="post" enctype="multipart/form-data" class="advSearch" title="Advanced Search">
       <fieldset id="author">
-        
-        
+
+
         <legend><span>Search by Author</span></legend>
         <ol id="as_ol_an">
@@ -76 +76 @@
               <ol>
                 <#if ((authorNameOp!"") == "any") || ((authorNameOp!"") == "")>
-                  <#assign anyChecked = checkedstr> 
-                  <#assign allChecked = ""> 
+                  <#assign anyChecked = checkedstr>
+                  <#assign allChecked = "">
                 <#elseif (authorNameOp!"") == "all">
-                  <#assign anyChecked = ""> 
-                  <#assign allChecked = checkedstr> 
+                  <#assign anyChecked = "">
+                  <#assign allChecked = checkedstr>
                 </#if>
                 <li><label><input type="radio" name="authorNameOp" value="any" ${anyChecked} /> <em>Any</em> of these authors</label></li>
@@ -130 +130 @@
                 <option value="month" <@slctd tstr="month" str=(dateTypeSelect!"")/>>Past month</option>
                 <option value="3months" <@slctd tstr="3months" str=(dateTypeSelect!"")/>>Past 3 months</option>
-                <option value="range" <@slctd tstr="range" str=(dateTypeSelect!"")/>>Specify a date range...</option>
+                <option value="6months" <@slctd tstr="6months" str=(dateTypeSelect!"")/>>Past 6 months</option>
+                <#--Commenting out due to bug with Mulgara search
+                option value="range" <@slctd tstr="range" str=(dateTypeSelect!"")/>>Specify a date range...</option-->
               </select>
             </span>
           </li>
-          <li id="pubDateOptions" class="options" style="display:none;">
+          <#--
+            Commenting out due to bug with Mulgara search
+            <li id="pubDateOptions" class="options" style="display:none;">
             <fieldset>
               <legend>Published between: </legend>
@@ -146 +150 @@
             </fieldset>
           </li>
+          -->
         </ol>
       </fieldset>
@@ -175 +180 @@
               </ul>
 <#else>
-There are no subjects in the system. 
+There are no subjects in the system.
 </#if>
             </fieldset>