Updated OAICat.jar, fixed DSpaceOAICatalog.java to suit. New OAICat f…

…ixes SF bug #1123934.

git-svn-id: http://scm.dspace.org/svn/repo/trunk@1114 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace/CHANGES

@@ -1,3 +1,7 @@
+(Robert Tansley)
+- Updated OAICat.jar, fixed DSpaceOAICatalog.java to suit.  New OAICat fixes
+  SF bug #1123934.
+
 1.2.2  beta 1
 =============
 (Jenny Toves, Brian Hughes, Larry Stone, William Reilly, Richard Rodgers)

dspace/lib/README

@@ -13,8 +13,8 @@ log4j.jar:           Log4j, for system logging (version 1.2.8)
 lucene.jar:          Lucene search engine (version 1.4.3)
 mail.jar:            JavaMail, used for sending e-mail (version 1.3.2)
 mets.jar*:           Harvard University Libraries METS toolkit (version 1.3.1)
-oaicat.jar:          OCLC's OAI data provider implementation (version 1.5.26)
-oro.jar:	         Jakarta-ORO, provide regular expressions (v2.0.8)
+oaicat.jar:          OCLC's OAI data provider implementation (version 1.5.34)
+oro.jar:             Jakarta-ORO, provide regular expressions (v2.0.8)
 PDFBox.jar           PDF Utilities, used for text extraction v 0.6.4
 servlet.jar:         Servlet interfaces (version 2.3)
 tm-extractors.jar:   textmining.org PDFExtract and WordExtract classes (v.0.2)

dspace/lib/licenses/oaicat.jar.license

@@ -1,6 +1,6 @@
-OCLC OAICat framework (oaicat.jar) license:
+OCLC OAICat framework (oaicat.jar) binary distribution notice:
 
-Copyright (c) 2000-2002 OCLC Online Computer Library Center, Inc. and other 
+Copyright (c) 2000-2005 OCLC Online Computer Library Center, Inc. and other 
 contributors. All rights reserved.
 
 OAICat source code available from:

dspace/src/org/dspace/app/oai/DSpaceRecordFactory.java

@@ -69,7 +69,7 @@ public DSpaceRecordFactory(Properties properties)
         super(properties);
     }
 
-    protected String fromOAIIdentifier(String identifier)
+    public String fromOAIIdentifier(String identifier)
     {
         // Our local identifier is actually the same as the OAI one (the Handle)
         return identifier;
@@ -83,23 +83,23 @@ public String quickCreate(Object nativeItem, String schemaURL,
         return null;
     }
 
-    protected String getOAIIdentifier(Object nativeItem)
+    public String getOAIIdentifier(Object nativeItem)
     {
         String h = DSpaceOAICatalog.OAI_ID_PREFIX
                 + ((HarvestedItemInfo) nativeItem).handle;
 
         return h;
     }
 
-    protected String getDatestamp(Object nativeItem)
+    public String getDatestamp(Object nativeItem)
     {
         Date d = ((HarvestedItemInfo) nativeItem).datestamp;
 
         // Return as ISO8601
         return new DCDate(d).toString();
     }
 
-    protected Iterator getSetSpecs(Object nativeItem)
+    public Iterator getSetSpecs(Object nativeItem)
     {
         HarvestedItemInfo hii = (HarvestedItemInfo) nativeItem;
         Iterator i = hii.collectionHandles.iterator();
@@ -116,14 +116,14 @@ protected Iterator getSetSpecs(Object nativeItem)
         return setSpecs.iterator();
     }
 
-    protected boolean isDeleted(Object nativeItem)
+    public boolean isDeleted(Object nativeItem)
     {
         HarvestedItemInfo hii = (HarvestedItemInfo) nativeItem;
 
         return hii.withdrawn;
     }
 
-    protected Iterator getAbouts(Object nativeItem)
+    public Iterator getAbouts(Object nativeItem)
     {
         // Nothing in the about section for now
         return new LinkedList().iterator();