Changeset 350

Timestamp:

04/14/10 12:39:22 (14 years ago)

Author:

oschonef

Message:

• add partial support for ListMetadataFormats? verb

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai

Files:

• OAIProvider.java (modified) (2 diffs)
• OAIRepository.java (modified) (2 diffs)
• OAIRepositoryAdapter.java (modified) (5 diffs)
• VerbContext.java (modified) (1 diff)
• impl/VerbContextImpl.java (modified) (1 diff)
• verb/ListMetadataFormatsVerb.java (added)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/OAIProvider.java

@@ -15 +15 @@
 import eu.clarin.cmdi.virtualcollectionregistry.oai.verb.GetRecordVerb;
 import eu.clarin.cmdi.virtualcollectionregistry.oai.verb.IdentifyVerb;
+import eu.clarin.cmdi.virtualcollectionregistry.oai.verb.ListMetadataFormatsVerb;
 import eu.clarin.cmdi.virtualcollectionregistry.oai.verb.Verb;
 
@@ -28 +29 @@
                 verbs = new ArrayList<Verb>();
                 verbs.add(new IdentifyVerb());
+                verbs.add(new ListMetadataFormatsVerb());
                 verbs.add(new GetRecordVerb());
         }

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/OAIRepository.java

@@ -5 +5 @@
 
 public interface OAIRepository {
-        public static enum Deleted {
+        public static enum DeletedNotion {
                 NO,
                 PERSISTENT,
                 TRANSIENT;
-        }
+        } // enum DeletedNotion
+        
         public static enum Granularity {
                 DAYS,
                 SECONDS;
-        }
+        } // enum Granularity
+
+        public static class MetadataFormat {
+                private final String prefix;
+                private final String namespaceURI;
+                private final String schemaLocation;
+                
+                public MetadataFormat(String prefix, String namespaceURI, String schemaLocation) {
+                        if (prefix == null) {
+                                throw new NullPointerException("prefix == null");
+                        }
+                        this.prefix = prefix;
+                        if (namespaceURI == null) {
+                                throw new NullPointerException("namespaceURI == null");
+                        }
+                        this.namespaceURI = namespaceURI;
+                        if (schemaLocation == null) {
+                                throw new NullPointerException("schemaLocation == null");
+                        }
+                        this.schemaLocation = schemaLocation;
+                }
+                
+                public String getPrefix() {
+                        return prefix;
+                }
+                
+                public String getNamespaceURI() {
+                        return namespaceURI;
+                }
+                
+                public String getSchemaLocation() {
+                        return schemaLocation;
+                }
+        } // class MetadataFormat
+
         public String getId();
         
@@ -22 +57 @@
         public Date getEarliestTimestamp();
         
-        public Deleted getDeletedNotion();
+        public DeletedNotion getDeletedNotion();
         
         public Granularity getGranularity();
 
-        public List<String> getSupportedMetadataPrefixes();
+        public List<MetadataFormat> getSupportedMetadataFormats();
 
         public String getDescription();

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/OAIRepositoryAdapter.java

@@ -6 +6 @@
 import java.util.TimeZone;
 
-import eu.clarin.cmdi.virtualcollectionregistry.oai.OAIRepository.Deleted;
+import eu.clarin.cmdi.virtualcollectionregistry.oai.OAIRepository.DeletedNotion;
 import eu.clarin.cmdi.virtualcollectionregistry.oai.OAIRepository.Granularity;
+import eu.clarin.cmdi.virtualcollectionregistry.oai.OAIRepository.MetadataFormat;
 
 
@@ -25 +26 @@
                 this.provider   = provider;
                 this.repository = repository;
+
+                // check of repository supports oai_dc format
+                if (!supportsMetadataFormat("oai_dc")) {
+                        throw new OAIException("repository does not supported " +
+                                        "mandatory \"oai_dc\" format");
+                }
 
                 // cache earliest timestamp
@@ -53 +60 @@
         }
 
-        public Deleted getDeletedNotion() {
+        public DeletedNotion getDeletedNotion() {
                 return repository.getDeletedNotion();
         }
@@ -61 +68 @@
         }
 
-        public List<String> getSupportedMetadataPrefixes() {
-                return repository.getSupportedMetadataPrefixes();
+        public List<MetadataFormat> getSupportedMetadataFormats() {
+                return repository.getSupportedMetadataFormats();
         }
 
@@ -81 +88 @@
         }
 
+        public boolean supportsMetadataFormat(String prefix) {
+                for (MetadataFormat format : repository.getSupportedMetadataFormats()) {
+                        if (prefix.equals(format.getPrefix())) {
+                                return true;
+                        }
+                }
+                return false;
+        }
+
         private static SimpleDateFormat createDateFormat(OAIRepository repository) {
                 SimpleDateFormat sdf = null;

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/VerbContext.java

@@ -20 +20 @@
         // XXX: add method for fetching request timestamp
 
+        public boolean hasArgument(Argument.Name name);
+
         public String getArgument(Argument.Name name);
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/oai/impl/VerbContextImpl.java

@@ -115 +115 @@
 
         @Override
+        public boolean hasArgument(Argument.Name name) {
+                boolean result = false;
+                if (arguments != null) {
+                        result = arguments.containsKey(name);
+                }
+                return result;
+        }
+
+        @Override
         public String getArgument(Argument.Name name) {
                 String value = null;