Changeset 4981

Timestamp:

04/15/14 12:40:40 (10 years ago)

Author:

Twan Goosen

Message:

Some further handle/filename improvements

Location:

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo

Files:

• service/impl/HandleClientImpl.java (modified) (3 diffs)
• service/impl/ResourceStringConverterImpl.java (modified) (1 diff)
• wicket/panels/search/SearchResultItemExpandedPanel.java (modified) (4 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/HandleClientImpl.java

@@ -18 +18 @@
 
 import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.ClientHandlerException;
 import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
 import com.sun.jersey.api.client.WebResource;
 import eu.clarin.cmdi.vlo.service.HandleClient;
@@ -30 +32 @@
 /**
  * Service that connects to the handle.net REST API and retrieves the URL for a
- * given handle
+ * given handle.
+ * 
+ * Consider re-implementing using the handle API
  *
  * @author twagoo
@@ -70 +74 @@
         final Client client = Client.create();
         final WebResource resource = client.resource(requestUrl);
-        final ClientResponse response = resource.accept(MediaType.APPLICATION_JSON_TYPE).get(ClientResponse.class);
 
-        if (response.getClientResponseStatus() != ClientResponse.Status.OK) {
-            logger.error("Unexpected response status {} for {}", response.getClientResponseStatus(), requestUrl);
-            return null;
-        } else {
-            final String responseString = response.getEntity(String.class);
-            try {
+        try {
+            final ClientResponse response = resource
+                    .accept(MediaType.APPLICATION_JSON_TYPE)
+                    .get(ClientResponse.class);
+
+            if (response.getClientResponseStatus() != ClientResponse.Status.OK) {
+                logger.error("Unexpected response status {} for {}", response.getClientResponseStatus(), requestUrl);
+            } else {
+                final String responseString = response.getEntity(String.class);
                 return getUrlFromJson(responseString);
-            } catch (JSONException ex) {
-                logger.error("Could not parse Handle API response", ex);
-                return null;
             }
+        } catch (UniformInterfaceException ex) {
+            logger.error("Could not communicate with Handle API", ex);
+        } catch (ClientHandlerException ex) {
+            logger.error("Could not communicate with Handle API", ex);
+        } catch (JSONException ex) {
+            logger.error("Could not parse Handle API response", ex);
         }
-
+        return null;
     }
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/ResourceStringConverterImpl.java

@@ -58 +58 @@
         final String[] tokens = resourceString.split(SPLIT_PATTERN, 2);
         final String mimeType = tokens[0];
-        final String href;
+        final String href = tokens[1];
+
+        // if there is a resolver, get file name from resolved URL
+        final String fileName;
         if (resolver == null) {
-            href = tokens[1];
+            fileName = getFileName(href);
         } else {
-            href = resolver.resolve(tokens[1]);
+            fileName = getFileName(resolver.resolve(href));
         }
 
-        final String fileName = getFileName(href);
         // determine resource type based on mime type
         final ResourceType resourceType = determineResourceType(mimeType);

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.java

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.FacetConstants;
+import eu.clarin.cmdi.vlo.pojo.ResourceInfo;
 import eu.clarin.cmdi.vlo.pojo.SearchContext;
 import eu.clarin.cmdi.vlo.service.FieldFilter;
@@ -25 +26 @@
 import eu.clarin.cmdi.vlo.wicket.components.SolrFieldLabel;
 import eu.clarin.cmdi.vlo.wicket.model.CollectionListModel;
+import eu.clarin.cmdi.vlo.wicket.model.HandleLinkModel;
 import eu.clarin.cmdi.vlo.wicket.model.ResourceInfoModel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldModel;
@@ -99 +101 @@
 
                 // add a link to the resource with the file name as its label
-                final ExternalLink resourceLink = new ExternalLink("resourceLink", new PropertyModel(resourceInfoModel, "href"));
+                final ExternalLink resourceLink = new ExternalLink("resourceLink", new HandleLinkModel(new PropertyModel(resourceInfoModel, "href")));
                 resourceLink.add(new Label("resourceName", new PropertyModel(resourceInfoModel, "fileName")));
                 resourceLink.setOutputMarkupId(true);
@@ -110 +112 @@
                     protected void onTimer(AjaxRequestTarget target) {
                         this.stop(target);
-                        resourceInfoModel.setObject(
-                                resolvingResourceStringConverter.getResourceInfo(item.getModelObject()));
+                        // this time get resource info from the resolving converter
+                        // which will take the file name from the resolved location
+                        final ResourceInfo newResourceInfo = resolvingResourceStringConverter.getResourceInfo(item.getModelObject());
+                        resourceInfoModel.setObject(newResourceInfo);
+                        // update resource link
                         target.add(resourceLink);
                     }