[Archive-access-cvs] archive-access/projects/nutch/src/web search.jsp,1.27,1.28

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/nutch/src/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30555/src/web

Modified Files:
	search.jsp 
Log Message:
Merge 'mapred' branch into HEAD.
* .classpath
* project.properties
    Update to point at new 0.8 nutch.
* build.xml
    Merge in 'mapred'.  Add job target.  
* conf/nutch-site.xml
    Cleanup. Removed unused properties or properties that have same values
    as nutch-default.xml (Except 'searcher.dir' -- keeping that here because
    we'll usually want to change it). Reordered so archive properties are
    towards the end. Brought forward descriptions from nutch-default where
    missing.
* conf/nutch-site.xml.template
    Copy of nutch-site.xml but with the nutchwax defaults turned on.
* src/plugin/build.xml
    Commented out parse-default.
* src/plugin/parse-ext/plugin.xml
    Changed path to parse-pdf.sh.
* src/web/search.jsp
    'mapred' update.
* bin/indexArcs.sh
* conf/ia-parse-plugins.xml 
* lib/commons-codec-1.3.jar 
* src/java/org/archive/access/nutch/ImportArcs.java 
* src/java/org/archive/access/nutch/IndexArcs.java 
    Added.
* bin/arc2seg.sh 
* src/java/org/archive/access/nutch/Arc2Segment.java 
    Removed.


Index: search.jsp
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/nutch/src/web/search.jsp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** search.jsp	24 Nov 2005 03:06:26 -0000	1.27
--- search.jsp	29 Nov 2005 21:43:43 -0000	1.28
***************
*** 16,19 ****
--- 16,20 ----
    import="org.apache.nutch.util.NutchConf"
    import="org.archive.access.nutch.NutchwaxQuery"
+   import="org.archive.util.ArchiveUtils"
  
  %><%!
***************
*** 186,193 ****
      String summary = summaries[i];
      String id = "idx=" + hit.getIndexNo() + "&id=" + hit.getIndexDocNo();
! 
!     String archiveDate = FORMAT.format(new Date(bean.getFetchDate(detail)));
!     String archiveDisplayDate =
!         DISPLAY_FORMAT.format(new Date(bean.getFetchDate(detail)));
      String archiveCollection = detail.getValue("collection");
      String url = detail.getValue("url");
--- 187,194 ----
      String summary = summaries[i];
      String id = "idx=" + hit.getIndexNo() + "&id=" + hit.getIndexDocNo();
!     
!     Date date = new Date(Long.valueOf(detail.getValue("date"))*1000);
!     String archiveDate = FORMAT.format(date);
!     String archiveDisplayDate = DISPLAY_FORMAT.format(date);
      String archiveCollection = detail.getValue("collection");
      String url = detail.getValue("url");