Changeset 759


Ignore:
Timestamp:
10/07/10 09:34:26 (14 years ago)
Author:
patdui
Message:
  • moved hardcoded url to config and initializing config a bit better
Location:
vlo/trunk/vlo_webapp/src/main
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/Configuration.java

    r750 r759  
    11package eu.clarin.cmdi.vlo;
    22
     3import java.io.UnsupportedEncodingException;
     4import java.net.URLEncoder;
    35
    46public final class Configuration {
    … …  
    79
    810    private String solrUrl;
     11
     12    private String imdiBrowserUrl = "http://corpus1.mpi.nl/ds/imdi_browser?openpath=";
    913
    1014    private Configuration() {
    … …  
    2327    }
    2428
     29    public void setIMDIBrowserUrl(String imdiBrowserUrl) {
     30        this.imdiBrowserUrl = imdiBrowserUrl;
     31    }
     32
     33    public String getIMDIBrowserUrl(String handle) {
     34        String result;
     35        try {
     36            result = imdiBrowserUrl + URLEncoder.encode(handle, "UTF-8");
     37        } catch (UnsupportedEncodingException e) {
     38            result = imdiBrowserUrl + handle;
     39        }
     40        return result;
     41    }
     42
    2543}

  • vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/VloApplication.java

    r750 r759  
    1414public class VloApplication extends WebApplication {
    1515
    16     private final SearchResultsDao searchResults = new SearchResultsDao();
     16    private final SearchResultsDao searchResults;
    1717
    18     /**
    19      * Constructor
    20      */
    2118    public VloApplication() {
    2219        BeanFactory factory = new ClassPathXmlApplicationContext(new String[] { "applicationContext.xml" });
    2320        factory.getBean("configuration"); //Use Configuration.getInstance to get the Configuration just loading the instance here.
     21        searchResults = new SearchResultsDao();
    2422    }
    2523

  • vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/dao/SearchResultsDao.java

    r719 r759  
    1515
    1616    public SearchResultsDao() { //TODO Patrick doing query twice not good.
     17        super();
    1718    }
    1819

  • vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/dao/SolrDao.java

    r750 r759  
    1818
    1919    private final static Logger LOG = LoggerFactory.getLogger(SolrDao.class);
    20     private final static CommonsHttpSolrServer SOLR_SERVER;
    21     static {
     20    private final CommonsHttpSolrServer solrServer;
     21
     22    public SolrDao() {
     23        String solrUrl = Configuration.getInstance().getSolrUrl();
    2224        try {
    23             SOLR_SERVER = new CommonsHttpSolrServer(Configuration.getInstance().getSolrUrl());
     25            solrServer = new CommonsHttpSolrServer(solrUrl);
    2426        } catch (MalformedURLException e) {
    25             throw new RuntimeException(e);
     27            throw new RuntimeException("URL: " + solrUrl, e);
    2628        }
    2729    }
    2830
    2931    protected CommonsHttpSolrServer getSolrserver() {
    30         return SOLR_SERVER;
     32        return solrServer;
    3133    }
    3234
    3335    protected QueryResponse fireQuery(SolrQuery query) {
    3436        try {
    35             return SOLR_SERVER.query(query);
     37            return solrServer.query(query);
    3638        } catch (SolrServerException e) {
    3739            LOG.error("Error getting data:", e);

  • vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java

    r750 r759  
    8585                "/Users/patdui/data/data/corpora/qfs1/media-archive/humanethology/Corpusstructure/humanethology.imdi.cmdi"));
    8686        originRootMap.put("OLAC Metadata Providers", new File(
    87                 "/Users/patdui/data/data/corpora/qfs1/media-archive/olac/OLAC/Corpusstructure/OLAC.imdi.cmdi"));
     87                "/Users/patdui/data/data/corpora/qfs1/media-archive/olac/OLAC/Corpusstructure/OLAC.imdi.cmdi")); //TODO PD OLAC is not there yet
    8888        originRootMap.put("SUCA", new File("/Users/patdui/data/data/corpora/qfs1/media-archive/suca_data/Corpusstructure/suca.imdi.cmdi"));
    8989        originRootMap.put("Nijmegen corpora of casual speech", new File(

  • vlo/trunk/vlo_webapp/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java

    r750 r759  
    1818import org.apache.wicket.model.Model;
    1919
     20import eu.clarin.cmdi.vlo.Configuration;
    2021import eu.clarin.cmdi.vlo.StringUtils;
    2122
    … …  
    3132        BookmarkablePageLink backLink = new BookmarkablePageLink("backLink", FacetedSearchPage.class, params);
    3233        add(backLink);
    33         //TODO PD configure browser url http://corpus1.mpi.nl/ds/imdi_browser or http://catalog.clarin.eu/ds/imdi_browser/?????
    34         String handle = docId.substring("test-".length());
    35         add(new ExternalLink("openBrowserLink", "http://corpus1.mpi.nl/ds/imdi_browser?openpath=" + handle));
     34        String handle = docId.substring("test-".length());
     35        add(new ExternalLink("openBrowserLink", Configuration.getInstance().getIMDIBrowserUrl(handle)));
    3636        addAttributesTable(docId);
    3737    }

  • vlo/trunk/vlo_webapp/src/main/resources/applicationContext.xml

    r750 r759  
    44
    55  <bean id="configuration" class="eu.clarin.cmdi.vlo.Configuration" factory-method="getInstance">
    6       <property name="solrUrl" value="http://localhost:8080/vlo_solr" />
    7 <!--        <property name="solrUrl" value="http://lux16.mpi.nl:8080/vlo_solr" />-->
     6    <property name="solrUrl" value="http://localhost:8080/vlo_solr" />
     7    <!--        <property name="solrUrl" value="http://lux16.mpi.nl:8080/vlo_solr" />-->
     8    <property name="IMDIBrowserUrl" value="http://corpus1.mpi.nl/ds/imdi_browser?openpath=" />
    89  </bean>
    910
Note: See TracChangeset for help on using the changeset viewer.