# # ChangeLog for vlo # # Generated by Trac 1.2.2 # 06/02/24 22:28:37 Fri, 13 Nov 2015 14:11:02 GMT davor.ostojic@oeaw.ac.at [6803] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/uniform_maps/resourceTypeMap.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/xslt/removeCrossMappings.xsl (added) xslt to remove crossMappings and new resourceType without them Thu, 12 Nov 2015 12:58:35 GMT Menzo Windhouwer [6800] * vlo/trunk/vlo-commons/src/main/resources/facetConcepts.xml (modified) Add the CCR handle to another reference to ... Thu, 12 Nov 2015 12:57:07 GMT Menzo Windhouwer [6799] * vlo/trunk/vlo-commons/src/main/resources/facetConcepts.xml (modified) Added CCR handle for http://www.isocat.org/datcat/DC-6846 Thu, 12 Nov 2015 09:22:13 GMT davor.ostojic@oeaw.ac.at [6798] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java (modified) reverted to original from trunk since we dont have to change paths ... Wed, 11 Nov 2015 10:11:15 GMT davor.ostojic@oeaw.ac.at [6797] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/bin/vlo_solr_importer.sh (modified) 3.3 -> 3.4 Wed, 11 Nov 2015 10:07:36 GMT davor.ostojic@oeaw.ac.at [6796] * vlo/branches/vlo-3.3-oeaw/vlo-commons/pom.xml (modified) orig pom from trunk Wed, 11 Nov 2015 10:05:42 GMT davor.ostojic@oeaw.ac.at [6795] * vlo/branches/vlo-3.3-oeaw/vlo-commons/pom.xml (modified) xslt plugin is moved to vlo-vocabularies Wed, 11 Nov 2015 10:02:04 GMT davor.ostojic@oeaw.ac.at [6794] * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java (modified) Wed, 11 Nov 2015 09:59:32 GMT davor.ostojic@oeaw.ac.at [6793] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/PostProcessorsWithVocabularyMap.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java (modified) maps will be read from classpath (vlo-vocabs), importer and tests are ... Wed, 11 Nov 2015 09:59:32 GMT davor.ostojic@oeaw.ac.at [6792] * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/resources/VloConfig.xml (modified) maps will be read from classpath (vlo-vocabs), importer and tests are ... Wed, 11 Nov 2015 09:45:45 GMT davor.ostojic@oeaw.ac.at [6791] * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/resources/maps (deleted) Tue, 10 Nov 2015 13:53:42 GMT davor.ostojic@oeaw.ac.at [6790] * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java (modified) mock service returns all facets in order to render page properly Tue, 10 Nov 2015 13:42:07 GMT davor.ostojic@oeaw.ac.at [6789] * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/wicket/pages/TestFacetedSearchPage.java (modified) facetNames match the original from VLO config, otherwise test wont work Tue, 10 Nov 2015 11:00:32 GMT davor.ostojic@oeaw.ac.at [6788] * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/FacetSelection.java (modified) Tue, 10 Nov 2015 09:19:11 GMT davor.ostojic@oeaw.ac.at [6785] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/NationalProjectPostProcessorTest.java (modified) Tue, 10 Nov 2015 09:16:55 GMT davor.ostojic@oeaw.ac.at [6784] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/OrganisationPostProcessor.java (modified) Tue, 10 Nov 2015 09:09:01 GMT davor.ostojic@oeaw.ac.at [6783] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/OrganisationPostProcessor.java (modified) Tue, 10 Nov 2015 08:37:58 GMT davor.ostojic@oeaw.ac.at [6782] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/.settings/org.eclipse.core.resources.prefs (modified) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/uniform_maps/resourceTypeMap.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/pojo/Constants.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/LanguageNameVariantsMap.xml (deleted) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/LicenseAvailabilityMap.xml (deleted) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/OrganisationControlledVocabulary.xml (deleted) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/nationalProjectsMapping.xml (deleted) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/profileName_resourceType_map.xml (deleted) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/resourceTypeMap.xml (deleted) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/test/resources/csv/CrossMapping.csv (added) Mon, 09 Nov 2015 16:23:42 GMT davor.ostojic@oeaw.ac.at [6778] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ResourceList.java (deleted) Mon, 09 Nov 2015 16:21:25 GMT davor.ostojic@oeaw.ac.at [6777] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java (modified) Mon, 09 Nov 2015 16:15:24 GMT davor.ostojic@oeaw.ac.at [6776] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/MetadataImporterTest.java (modified) Mon, 09 Nov 2015 16:10:20 GMT davor.ostojic@oeaw.ac.at [6775] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/LanguageNameVariantsMap.xml (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/LicenseAvailabilityMap.xml (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/OrganisationControlledVocabulary.xml (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/nationalProjectsMapping.xml (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/profileName_resourceType_map.xml (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/resourceTypeMap.xml (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/uniform_maps (deleted) Mon, 09 Nov 2015 16:07:06 GMT davor.ostojic@oeaw.ac.at [6774] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java (modified) Mon, 09 Nov 2015 16:05:52 GMT davor.ostojic@oeaw.ac.at [6773] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/PostProcessorsWithVocabularyMap.java (modified) postprocessor will try first to obtain normalisation map from file ... Mon, 09 Nov 2015 15:55:38 GMT davor.ostojic@oeaw.ac.at [6772] * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/resources/VloConfig.xml (modified) use crossMapping is optional Mon, 09 Nov 2015 15:54:59 GMT davor.ostojic@oeaw.ac.at [6771] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java (modified) use crossMapping is optional Mon, 09 Nov 2015 15:36:02 GMT davor.ostojic@oeaw.ac.at [6770] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ImporterTestcase.java (modified) Mon, 09 Nov 2015 15:35:30 GMT davor.ostojic@oeaw.ac.at [6769] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/uniform_maps (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/uniform_maps/LanguageNameVariantsMap.xml (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/uniform_maps/LicenseAvailabilityMap.xml (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/uniform_maps/OrganisationControlledVocabulary.xml (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/uniform_maps/nationalProjectsMapping.xml (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/uniform_maps/profileName_resourceType_map.xml (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/resources/uniform_maps/resourceTypeMap.xml (added) uniform maps added to the resources Mon, 09 Nov 2015 15:29:04 GMT davor.ostojic@oeaw.ac.at [6768] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/MetadataImporterTest.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/ResourceList.java (added) ClassPathPrinter for tests Mon, 09 Nov 2015 15:21:58 GMT davor.ostojic@oeaw.ac.at [6767] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/pom.xml (modified) maps/uniform maps to class path Mon, 09 Nov 2015 15:14:02 GMT davor.ostojic@oeaw.ac.at [6766] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/pom.xml (modified) maps/uniform maps to class path Mon, 09 Nov 2015 15:04:54 GMT davor.ostojic@oeaw.ac.at [6765] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/pom.xml (modified) maps/uniform maps to class path Mon, 09 Nov 2015 14:18:11 GMT davor.ostojic@oeaw.ac.at [6764] * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigMarshallerTest.java (modified) test modifications wrt different facets (resTypeOrig, profileName, ... Mon, 09 Nov 2015 14:15:56 GMT davor.ostojic@oeaw.ac.at [6763] * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java (modified) merged with trunk 3.4 Mon, 09 Nov 2015 13:52:46 GMT davor.ostojic@oeaw.ac.at [6762] * vlo/branches/vlo-3.3-oeaw (modified) * vlo/branches/vlo-3.3-oeaw/CHANGES.txt (modified) * vlo/branches/vlo-3.3-oeaw/UPGRADE.txt (modified) * vlo/branches/vlo-3.3-oeaw/pom.xml (modified) merged with trunk 3.4 Mon, 09 Nov 2015 13:51:46 GMT davor.ostojic@oeaw.ac.at [6761] * vlo/branches/vlo-3.3-oeaw/vlo-distribution (modified) * vlo/branches/vlo-3.3-oeaw/vlo-distribution/src/main/assembly/installPackageBuilder.xml (modified) merged with trunk 3.4 Mon, 09 Nov 2015 13:49:39 GMT davor.ostojic@oeaw.ac.at [6760] * vlo/branches/vlo-3.3-oeaw/vlo-importer (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/pom.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataMapper.java (copied) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/ResourceStructureGraph.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/CMDIDataProcessorTest.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessorTest.java (modified) merged with trunk 3.4 Mon, 09 Nov 2015 13:43:33 GMT davor.ostojic@oeaw.ac.at [6759] * vlo/branches/vlo-3.3-oeaw/vlo-distribution/src/main/bin/unpack-wars.sh (modified) merged with trunk 3.4 Mon, 09 Nov 2015 13:43:25 GMT davor.ostojic@oeaw.ac.at [6758] * vlo/branches/vlo-3.3-oeaw/vlo-distribution/pom.xml (modified) merged with trunk 3.4 Mon, 09 Nov 2015 13:40:15 GMT davor.ostojic@oeaw.ac.at [6757] * vlo/branches/vlo-3.3-oeaw/vlo-web-app (modified) merged with trunk 3.4 Mon, 09 Nov 2015 13:37:30 GMT davor.ostojic@oeaw.ac.at [6756] * vlo/branches/vlo-3.3-oeaw/vlo-web-app/build.sh (deleted) merged with trunk 3.4 Mon, 09 Nov 2015 13:36:42 GMT davor.ostojic@oeaw.ac.at [6755] * vlo/branches/vlo-3.3-oeaw/vlo-web-app/pom.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/JavaScriptResources.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/AbstractSolrQueryFactory.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDaoImpl.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImpl.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetQueryFactoryImpl.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermBehavior.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermScriptFactory.java (copied) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/ResourceTypeCssBehaviour.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/AjaxFallbackLinkLabel.html (copied) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/AjaxFallbackLinkLabel.java (copied) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/SolrDocumentModel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/SolrFieldNameModel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.html (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/SimpleSearchPage.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/VloBasePage.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.html (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/HierarchyPanel.html (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/HierarchyPanel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/RecordNavigationPanel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/ResourceLinkDetailsPanel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/ResourceLinksPanel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AdvancedSearchOptionsPanel.html (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AdvancedSearchOptionsPanel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AllFacetValuesPanel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetValuesPanel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetsPanel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchFormPanel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemCollapsedPanel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemExpandedPanel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemPanel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultsPanel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SimpleSearchBrowsePanel.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProvider.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/ListProvider.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/PartitionedDataProvider.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/jquery.highlight.js (copied) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/searchhi.js (deleted) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/vlo-fields-table.js (copied) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/vlo-searchform.js (copied) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-search.less (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/resources/fieldNames.properties (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/webapp/iframe/vlo-embed-base.html (modified) * vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetQueryFactoryImplTest.java (modified) merged with trunk 3.4 Mon, 09 Nov 2015 13:22:00 GMT davor.ostojic@oeaw.ac.at [6754] * vlo/branches/vlo-3.3-oeaw/vlo-commons (modified) * vlo/branches/vlo-3.3-oeaw/vlo-commons/pom.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/FacetConstants.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/LanguageCodeUtils.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/resources/VloConfig.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/resources/dataroots-beta.xml (copied) * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/resources/dataroots-testvm.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/DefaultVloConfigFactoryTest.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/test/java/eu/clarin/cmdi/vlo/config/VloConfigMarshallerTest.java (modified) merged with trunk 3.4 Mon, 09 Nov 2015 11:16:25 GMT davor.ostojic@oeaw.ac.at [6753] * vlo/branches/vlo-3.3-oeaw/vlo-solr (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/pom.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/_rest_managed.json (copied) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/_schema_analysis_stopwords_english.json (copied) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/_schema_analysis_synonyms_english.json (copied) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/admin-extra.html (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/admin-extra.menu-bottom.html (copied) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/admin-extra.menu-top.html (copied) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/currency.xml (copied) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/customCollationRules.bin (deleted) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/elevate.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/mapping-FoldToASCII.txt (copied) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/mapping-ISOLatin1Accent.txt (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/schema.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/solrconfig.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/xslt/example.xsl (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/xslt/example_atom.xsl (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/xslt/example_rss.xsl (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/xslt/luke.xsl (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/solr_conf/solr/collection1/conf/xslt/updateXml.xsl (copied) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/META-INF/LICENSE.txt (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/META-INF/MANIFEST.MF (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/META-INF/NOTICE.txt (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/WEB-INF/web.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/WEB-INF/weblogic.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/admin.html (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/css/styles/cloud.css (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/css/styles/common.css (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/css/styles/files.css (copied) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/css/styles/logging.css (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/css/styles/menu.css (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/img/ZeroClipboard.swf (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/img/favicon.ico (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/img/ico/drive-upload.png (copied) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/img/ico/pencil.png (copied) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/js/lib/jquery-1.7.2.min.js (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/js/lib/jquery.ajaxfileupload.js (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/js/lib/jquery.jstree.js (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/js/main.js (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/js/require.js (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/js/scripts/analysis.js (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/js/scripts/app.js (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/js/scripts/cores.js (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/js/scripts/dataimport.js (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/js/scripts/files.js (copied) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/js/scripts/logging.js (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/js/scripts/plugins.js (modified) * vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/tpl/files.html (copied) merged with trunk Mon, 09 Nov 2015 09:57:47 GMT davor.ostojic@oeaw.ac.at [6752] * vlo/branches/vlo-3.3-oeaw/docs/Introduction to the VLO Faceted Browser.docx (modified) Wed, 04 Nov 2015 13:28:19 GMT davor.ostojic@oeaw.ac.at [6741] * vlo/branches/vlo-3.3-oeaw/test.txt (deleted) Wed, 04 Nov 2015 13:27:50 GMT davor.ostojic@oeaw.ac.at [6740] * vlo/branches/vlo-3.3-oeaw/pom.xml (modified) Wed, 04 Nov 2015 13:15:54 GMT davor.ostojic@oeaw.ac.at [6739] * vlo/branches/vlo-3.3-oeaw/test.txt (added) Tue, 03 Nov 2015 16:26:23 GMT Twan Goosen [6737] * vlo/trunk/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataMapper.java (added) added Menzo's MetadataMapper utility class Tue, 03 Nov 2015 16:24:44 GMT Twan Goosen [6736] * vlo/branches/vlo-3.2 (deleted) removed old branch vlo-3.2 Tue, 03 Nov 2015 16:24:18 GMT Twan Goosen [6735] * vlo/trunk (modified) * vlo/trunk/CHANGES.txt (modified) * vlo/trunk/vlo-commons/pom.xml (modified) * vlo/trunk/vlo-commons/src/main/resources/dataroots-testvm.xml (modified) merged changes from 3.3 branch Tue, 03 Nov 2015 07:45:52 GMT Twan Goosen [6733] * vlo/tags/vlo-3.3.2 (copied) * vlo/tags/vlo-3.3.2/pom.xml (modified) * vlo/tags/vlo-3.3.2/vlo-commons/pom.xml (modified) * vlo/tags/vlo-3.3.2/vlo-distribution/pom.xml (modified) * vlo/tags/vlo-3.3.2/vlo-importer/pom.xml (modified) * vlo/tags/vlo-3.3.2/vlo-solr/pom.xml (modified) * vlo/tags/vlo-3.3.2/vlo-web-app/pom.xml (modified) tagged vlo-3.3.2 Mon, 02 Nov 2015 16:19:44 GMT davor.ostojic@oeaw.ac.at [6732] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java (modified) Mon, 02 Nov 2015 16:03:04 GMT davor.ostojic@oeaw.ac.at [6731] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/PostProcessorsWithVocabularyMap.java (modified) Mon, 02 Nov 2015 15:55:58 GMT davor.ostojic@oeaw.ac.at [6730] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIComponentProfileNamePostProcessor.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java (modified) ProfilePostProc got a normalization map for cross-mapping Mon, 02 Nov 2015 15:22:55 GMT davor.ostojic@oeaw.ac.at [6729] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIData.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/NationalProjectPostProcessor.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/PostProcessorsWithVocabularyMap.java (modified) PostProcessorWithVocabulary implements NormalizaitonService Mon, 02 Nov 2015 15:22:08 GMT davor.ostojic@oeaw.ac.at [6728] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/normalization (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/normalization/NormalizationService.java (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/normalization/NormalizationVocabulary.java (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/normalization/VocabularyEntry.java (moved) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/pojo/VariantsMap.java (modified) NormalizationService and NormalizationVocabulary as top level classes Mon, 02 Nov 2015 09:37:48 GMT davor.ostojic@oeaw.ac.at [6727] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/pojo/VariantsMap.java (modified) EntryMap gets trimmed values Fri, 30 Oct 2015 19:36:55 GMT davor.ostojic@oeaw.ac.at [6726] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/pojo/VocabularyEntry.java (modified) Fri, 30 Oct 2015 19:23:49 GMT davor.ostojic@oeaw.ac.at [6725] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/PostProcessorsWithVocabularyMap.java (modified) Fri, 30 Oct 2015 19:08:57 GMT davor.ostojic@oeaw.ac.at [6724] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/pojo/VariantsMap.java (modified) Fri, 30 Oct 2015 18:55:03 GMT davor.ostojic@oeaw.ac.at [6723] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java (modified) Fri, 30 Oct 2015 18:50:42 GMT davor.ostojic@oeaw.ac.at [6722] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/pojo/VocabularyEntry.java (modified) Fri, 30 Oct 2015 18:40:50 GMT davor.ostojic@oeaw.ac.at [6721] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/PostProcessorsWithVocabularyMap.java (modified) Fri, 30 Oct 2015 18:30:56 GMT davor.ostojic@oeaw.ac.at [6720] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java (modified) Fri, 30 Oct 2015 17:59:53 GMT davor.ostojic@oeaw.ac.at [6719] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/PostProcessorsWithVocabularyMap.java (modified) Fri, 30 Oct 2015 17:37:53 GMT davor.ostojic@oeaw.ac.at [6718] * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/resources/VloConfig.xml (modified) Fri, 30 Oct 2015 17:27:50 GMT davor.ostojic@oeaw.ac.at [6717] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/pom.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/transformers/CSVTransformer.java (modified) Fri, 30 Oct 2015 17:20:18 GMT davor.ostojic@oeaw.ac.at [6716] * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/FacetConstants.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-commons/src/main/java/eu/clarin/cmdi/vlo/config/VloConfig.java (modified) Fri, 30 Oct 2015 17:19:52 GMT davor.ostojic@oeaw.ac.at [6715] * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/AvailabilityPostProcessor.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/CMDIParserVTDXML.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessor.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/NationalProjectPostProcessor.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/OrganisationPostProcessor.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/PostProcessorsWithVocabularyMap.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/ProfileNamePostProcessor.java (added) * vlo/branches/vlo-3.3-oeaw/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/ResourceClassPostProcessor.java (modified) cross-mapping vocabulary-entry instead of invertedMap Fri, 30 Oct 2015 17:18:57 GMT davor.ostojic@oeaw.ac.at [6714] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/pojo/VariantsMap.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/pojo/VocabularyEntry.java (added) Fri, 30 Oct 2015 13:54:27 GMT teckart@informatik.uni-leipzig.de [6713] * vlo/trunk/vlo-solr/src/main/solr_conf/solr/collection1/conf/customCollationRules.bin (deleted) * vlo/trunk/vlo-solr/src/main/solr_conf/solr/collection1/conf/schema.xml (modified) Removed CollationKeyFilter (#793). This filter is deprecated in Solr ... Fri, 30 Oct 2015 13:08:46 GMT teckart@informatik.uni-leipzig.de [6712] * vlo/trunk/vlo-solr/src/main/solr_conf/solr/collection1/conf/solrconfig.xml (modified) Commented out requestHandlers that are automatically created by Solr ... Fri, 30 Oct 2015 10:36:45 GMT davor.ostojic@oeaw.ac.at [6711] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/pojo/Constants.java (modified) profile_resoruceType map Fri, 30 Oct 2015 10:36:17 GMT davor.ostojic@oeaw.ac.at [6710] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/csv/profileName_resourceType_map.txt (modified) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/excel (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/uniform_maps/profileName_resourceType_map.xml (added) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/uniform_maps/resourceTypeMap.xml (modified) Fri, 30 Oct 2015 10:19:30 GMT davor.ostojic@oeaw.ac.at [6709] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/pojo/CrossMapping.java (modified) reimplementation regarding new use cases Fri, 30 Oct 2015 10:19:12 GMT davor.ostojic@oeaw.ac.at [6708] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/main/TransformAllMaps.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/pojo/Constants.java (modified) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/src/main/java/eu/clarin/cmdi/vlo/transformers/CSVTransformer.java (modified) reimplementation regarding new use cases Fri, 30 Oct 2015 08:48:01 GMT davor.ostojic@oeaw.ac.at [6707] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/old_maps/LanguageNameVariantsMap.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/old_maps/OrganisationControlledVocabulary.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/uniform_maps/LanguageNameVariantsMap.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/uniform_maps/LicenseAvailabilityMap.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/uniform_maps/OrganisationControlledVocabulary.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/uniform_maps/nationalProjectsMapping.xml (modified) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/uniform_maps/resourceTypeMap.xml (modified) new maps from trunk Thu, 29 Oct 2015 16:20:18 GMT Twan Goosen [6706] * vlo/branches/vlo-3.3/CHANGES.txt (modified) Changes for 3.3.2 Thu, 29 Oct 2015 16:18:55 GMT Twan Goosen [6705] * vlo/branches/vlo-3.3/CHANGES.txt (modified) Changes for 3.3.2 Thu, 29 Oct 2015 09:17:26 GMT Twan Goosen [6703] * vlo/tags/vlo-3.3.2-RC1 (copied) * vlo/tags/vlo-3.3.2-RC1/pom.xml (modified) * vlo/tags/vlo-3.3.2-RC1/vlo-commons/pom.xml (modified) * vlo/tags/vlo-3.3.2-RC1/vlo-distribution/pom.xml (modified) * vlo/tags/vlo-3.3.2-RC1/vlo-importer/pom.xml (modified) * vlo/tags/vlo-3.3.2-RC1/vlo-solr/pom.xml (modified) * vlo/tags/vlo-3.3.2-RC1/vlo-web-app/pom.xml (modified) tagged vlo 3.3.2-RC1 Mon, 26 Oct 2015 14:55:31 GMT Twan Goosen [6702] * vlo/branches/vlo-3.3/vlo-commons/pom.xml (modified) * vlo/branches/vlo-3.3/vlo-commons/src/main/resources/dataroots-testvm.xml (modified) test VM dataroots Mon, 26 Oct 2015 14:15:09 GMT Twan Goosen [6701] * vlo/trunk (modified) trunk in sync with 3.3 branch Mon, 26 Oct 2015 14:14:48 GMT Twan Goosen [6700] * vlo/branches/vlo-3.3 (modified) * vlo/branches/vlo-3.3/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java (modified) * vlo/branches/vlo-3.3/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/ResourceStructureGraph.java (modified) Merged fix for #790 to 3.3 branch Mon, 26 Oct 2015 14:07:23 GMT teckart@informatik.uni-leipzig.de [6699] * vlo/trunk/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/MetadataImporter.java (modified) Added new hierarchy graph check that removes edges between vertices ... Mon, 26 Oct 2015 14:02:22 GMT teckart@informatik.uni-leipzig.de [6698] * vlo/trunk/vlo-importer/src/main/java/eu/clarin/cmdi/vlo/importer/ResourceStructureGraph.java (modified) Added new helper methods and more consistent handling of normalized ... Wed, 21 Oct 2015 14:13:00 GMT Twan Goosen [6695] * vlo/trunk (modified) * vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermScriptFactory.java (modified) merged changes from 3.3 branch to trunk Wed, 21 Oct 2015 14:12:37 GMT Twan Goosen [6694] * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermScriptFactory.java (modified) highlighting and wildcards: * strip them when matching * use word ... Tue, 20 Oct 2015 13:53:25 GMT Twan Goosen [6691] * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermScriptFactory.java (modified) highlight script factory marked serializable to prevent warnings in ... Tue, 20 Oct 2015 13:18:13 GMT Twan Goosen [6690] * vlo/trunk (modified) * vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/JavaScriptResources.java (modified) * vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermBehavior.java (modified) * vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermScriptFactory.java (copied) * vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.html (modified) * vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java (modified) * vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.html (modified) * vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.java (modified) * vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemPanel.java (modified) * vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultsPanel.java (modified) * vlo/trunk/vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/jquery.highlight.js (copied) * vlo/trunk/vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/searchhi.js (deleted) * vlo/trunk/vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/vlo-fields-table.js (copied) * vlo/trunk/vlo-web-app/src/main/less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-search.less (modified) merged updates from 3.3 branch to trunk Tue, 20 Oct 2015 13:15:51 GMT Twan Goosen [6689] * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermScriptFactory.java (modified) improved query sanitising for highlighting Tue, 20 Oct 2015 12:28:17 GMT Twan Goosen [6688] * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultItemPanel.java (modified) Update highlighting in search results after collapse/expand Tue, 20 Oct 2015 11:27:53 GMT Twan Goosen [6687] * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermBehavior.java (modified) * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermScriptFactory.java (added) * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SearchResultsPanel.java (modified) * vlo/branches/vlo-3.3/vlo-web-app/src/main/less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-search.less (modified) highlight in search results Tue, 20 Oct 2015 09:13:20 GMT Twan Goosen [6686] * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/JavaScriptResources.java (modified) * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/HighlightSearchTermBehavior.java (modified) * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.html (modified) * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java (modified) * vlo/branches/vlo-3.3/vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/jquery.highlight.js (added) * vlo/branches/vlo-3.3/vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/searchhi.js (deleted) Search term highlighting with the highlight JQuery plugin. Added some ... Tue, 20 Oct 2015 07:35:04 GMT Twan Goosen [6685] * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/JavaScriptResources.java (modified) * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.html (modified) * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/FieldsTablePanel.java (modified) * vlo/branches/vlo-3.3/vlo-web-app/src/main/js/eu/clarin/cmdi/vlo/wicket/pages/vlo-fields-table.js (added) Facet/field description popups (via 'title' attribute) in the record page Tue, 13 Oct 2015 18:27:07 GMT Twan Goosen [6681] * vlo/trunk (modified) * vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/AjaxFallbackLinkLabel.html (copied) * vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/AjaxFallbackLinkLabel.java (copied) * vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/HierarchyPanel.html (modified) * vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/HierarchyPanel.java (modified) merged changes from 3.3 branch to trunk (refs #805) Tue, 13 Oct 2015 16:01:23 GMT matej.durco@oeaw.ac.at [6680] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/csv/ACDH_resourceType.txt (modified) merged conflicts with last three commits by davor; introduced more ... Tue, 13 Oct 2015 15:09:09 GMT Twan Goosen [6679] * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/HierarchyPanel.java (modified) removed obsolete todo Tue, 13 Oct 2015 15:07:57 GMT Twan Goosen [6678] * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/AjaxFallbackLinkLabel.html (added) * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/AjaxFallbackLinkLabel.java (added) * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/HierarchyPanel.html (modified) * vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/record/HierarchyPanel.java (modified) "Show all" link for collections with more than 50 children Refs #805 Tue, 13 Oct 2015 13:07:19 GMT davor.ostojic@oeaw.ac.at [6677] * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/csv/ACDH_resourceType.txt (modified) * vlo/branches/vlo-3.3-oeaw/vlo-vocabularies/maps/uniform_maps/resourceTypeMap.xml (modified) -- Germany fixed