Changeset 2578

Timestamp:

02/13/13 12:32:44 (11 years ago)

Author:

keeloo

Message:

Version 2.13 - added changes caused by a change in the VloApplication? class.

Location:

vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo

Files:

• dao/SolrDao.java (modified) (1 diff)
• pages/FacetedSearchPage.java (modified) (1 diff)
• pages/HtmlFormCreator.java (modified) (1 diff)
• pages/ResourceLinkPanel.java (modified) (2 diffs)
• pages/SearchPageQuery.java (modified) (1 diff)
• pages/ShowResultPage.java (modified) (1 diff)

vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/dao/SolrDao.java

@@ -22 +22 @@
 
     public SolrDao() {
-        String solrUrl = WebAppConfig.get().getSolrUrl();
+        String solrUrl = WebAppConfig.open().getSolrUrl();
         try {
             solrServer = new CommonsHttpSolrServer(solrUrl);

vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java

@@ -59 +59 @@
                 public SearchBoxForm(String id, SearchPageQuery query) {
                         super(id, new CompoundPropertyModel<SearchPageQuery>(query));
-                        add(new ExternalLink("vloHomeLink", WebAppConfig.get().getVloHomeLink()));
+                        add(new ExternalLink("vloHomeLink", WebAppConfig.open().getVloHomeLink()));
                         searchBox = new AutoCompleteTextField<String>("searchQuery") {
                                 @Override

vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/HtmlFormCreator.java

@@ -36 +36 @@
                 }               
                 
-                String form = "<form method=\"post\" action=\""+WebAppConfig.get().getFederatedContentSearchUrl()+"\"> \n"
+                String form = "<form method=\"post\" action=\""+WebAppConfig.open().getFederatedContentSearchUrl()+"\"> \n"
                                 + "<fieldset style=\"border:0px;\"> \n"
                                 + "\t  <label for=\"query\">CQL query:</label> \n"

vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/ResourceLinkPanel.java

@@ -80 +80 @@
             if (resourceLink.startsWith(FacetConstants.HANDLE_PREFIX)) {
                 String handle = resourceLink.substring(FacetConstants.HANDLE_PREFIX.length());
-                result = WebAppConfig.get().getHandleServerUrl() + handle;
+                result = WebAppConfig.open().getHandleServerUrl() + handle;
             } else if(resourceLink.startsWith(FacetConstants.URN_NBN_PREFIX)) {
                 result = URN_NBN_RESOLVER_URL+resourceLink;
@@ -126 +126 @@
             if (resourceLink.startsWith(FacetConstants.HANDLE_PREFIX)) {
                 String handle = resourceLink.substring(FacetConstants.HANDLE_PREFIX.length());
-                resourceLink = WebAppConfig.get().getHandleServerUrl() + handle;
+                resourceLink = WebAppConfig.open().getHandleServerUrl() + handle;
                 // Now points to something like http://hdl.handle.net/1839/00-0000-0000-0004-3357-F
                 HttpURLConnection con = null;

vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/SearchPageQuery.java

@@ -74 +74 @@
         result.setFacet(true);
         result.setFacetMinCount(1);
-        result.addFacetField(WebAppConfig.get().getFacetFields());
+        result.addFacetField(WebAppConfig.open().getFacetFields());
         return result;
     }

vlo/branches/vlo-2.13-param/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java

@@ -118 +118 @@
             }
             if (linkToOriginalContext.startsWith(FacetConstants.HANDLE_MPI_PREFIX)) {
-                result = WebAppConfig.get().getIMDIBrowserUrl(linkToOriginalContext);
+                result = WebAppConfig.open().getIMDIBrowserUrl(linkToOriginalContext);
             } else {
                 try {