Commit Graph

4974 Commits

Author SHA1 Message Date
abollini
70a52cadc2 Merge pull request #54 from EKT/DS-1225
[DS-1225] Show display values (input-forms) for controlled vocabularies in ItemTag
2012-09-17 09:11:05 -07:00
Rania Stathopoulou
a2286545ce DS-1225-Show display values for controlled vocabularies(input forms) in Item Page 2012-09-17 18:55:02 +03:00
abollini
0bad4bf743 Merge pull request #52 from EKT/DS-1223
[DS-1223] Display frequencies of items in single browsing for selected indices
2012-09-17 02:49:10 -07:00
EKT
f5895a52d1 squashing 2012-09-17 12:42:33 +03:00
Rania Stathopoulou
b23cb050d1 Merge pull request #55 from EKT/DS-1231
[DS-1231] Indexing both stored and display-value from input-forms for search

Squashed commit of the following:

commit 426db183fc
Merge: b05c6a3 8334fce
Author: kstamatis <kstamatis@ekt.gr>
Date:   Sat Sep 15 08:52:12 2012 -0700

    Merge pull request #2 from abollini/DS-1231

    Ds 1231

commit 8334fceed0
Author: Andrea Bollini <bollini@cilea.it>
Date:   Sat Sep 15 17:31:08 2012 +0200

    Use the default input set if the item is not yet archived

commit c6be362592
Author: Andrea Bollini <bollini@cilea.it>
Date:   Sat Sep 15 17:23:48 2012 +0200

    Minor changes

    Code formatted using the dspace style eclipse formatter
    No store values in the index as the lucene projection is not currently used
    use generics to avoid raw type warning

commit 6e6933d174
Merge: 3b1cc06 b05c6a3
Author: Andrea Bollini <bollini@cilea.it>
Date:   Sat Sep 15 16:19:20 2012 +0200

    Merge remote-tracking branch 'EKT/DS-1231' into DS-1231

commit b05c6a3288
Author: Rania Stathopoulou <iostath@ekt.gr>
Date:   Fri Sep 14 19:49:27 2012 +0300

    Search indexing all values (now getControlledVocabulariesDisplayValueLocalized returns a list of all the values and the DSIndexer manages these values)
    A return statement is added if the item has no collection

commit 33da186e6c
Author: Rania Stathopoulou <iostath@ekt.gr>
Date:   Thu Sep 13 11:19:56 2012 +0300

    Code Indentation

commit c31651bdd8
Author: Rania Stathopoulou <iostath@ekt.gr>
Date:   Tue Sep 11 11:54:43 2012 +0300

    Code changed in order to index both stored and display-value for all localized input-forms if the user specifies 'inputform' in Search Index Configuration of dspace.cfg, e.g: search.index.12 = language:dc.language:inputform

commit d278958c22
Author: Rania Stathopoulou <iostath@ekt.gr>
Date:   Fri Sep 7 12:19:25 2012 +0300

    Package name 'gr.ekt.repositories.dspace.utils' removed.
    All functions in gr.ekt.repositories.dspace.utils.Utilities.java were transfered in org.dspace.app.util.Util.java
    Documentation added for the above functions

commit 8135fd4eb7
Author: EKT <iostath@ekt.gr>
Date:   Wed Aug 8 18:40:40 2012 +0300

    Unthrown exceptions added

commit fa8796bfeb
Author: EKT <iostath@ekt.gr>
Date:   Wed Aug 8 17:06:20 2012 +0300

    Indexing both stored and display-value from input-forms for search
2012-09-17 11:13:57 +02:00
helix84
d0fa70843e Merge pull request #76 from helix84/ldap-improvements
Ldap improvements
2012-09-17 02:06:27 -07:00
Ivan Masár
03f0ed903e fix whitespace in LDAPAuthentication.java 2012-09-17 10:39:29 +02:00
Ivan Masár
8c4341357b fix the special case of anonymous LDAP search
Hierarchical LDAP originally assumed that when search.user is not
set, anonymous search is performed. We now assume that if it's
not set, simple LDAP authentication is performed. That retains
configuration backward comaptibility for the two most common cases.
The special case of anonymous search now requires search.anonymous
to be set to true, which means old installations using this setup
will have to add this config property.
2012-09-17 10:29:40 +02:00
Ivan Masár
3c45c1bc67 consolidate LDAP and LDAPHierarchical auth
Thanks to the previously merged DS-1180, the LDAPHierarchicalAuthentication
method gaind the capabilities of LDAPAuthentication. This commit renames
LDAPHierarchicalAuthentication to LDAPAuthentication and removes the
original LDAPAuthentication.
2012-09-17 10:29:40 +02:00
Ivan Masár
79c0142c27 [DS-1078] LDAP group to DSpace group on login 2012-09-17 10:29:40 +02:00
helix84
91b49278dd Merge pull request #74 from helix84/display-bitstream-rights
[DS-1193] display bitstream read access permissions on item page (squashed)
2012-09-17 01:26:29 -07:00
Ivan Masár
2499436c97 [DS-1193] display bitstream read access permissions on item page (squashed)
This displays the bitstream READ rights information at the item page
in Mirage, but doesn't indicate whether the currently logged in user
has READ access.
2012-09-17 10:19:07 +02:00
Lyncode
c8692ee8c1 New catch (Exception) 2012-09-17 01:30:18 +01:00
Peter Dietz
4391d21193 Refactored ES Stats UI to come from IncludePageMeta, instead of theme 2012-09-16 18:43:05 -04:00
Peter Dietz
37550b557e Add isUseProxies to SpiderDectector, to remove solr dependency
Also, a fixed a typo in dspace.cfg, no code refers to log.useProxies,
just useProxies.
2012-09-16 13:44:21 -04:00
Peter Dietz
afa0050b9b Move implementation agnostic usage-stats configs to new config module
Not sure if I need to add usage-statistics.cfg to module overlay pom for filter
2012-09-16 13:44:21 -04:00
Peter Dietz
dc6548eaee Move ES configs into module structure of elastic-search-statistics 2012-09-16 13:44:21 -04:00
Peter Dietz
9282c2a6c5 Remove copy/paste metadataStorage from ES, following DS-421
Stumbled upon strange code, that has a note in DS-421.
Which says metadata storage in usage-event stats engine was inadvertent,
so ES has no need to include this. Note: I haven't touched SolrLogger
2012-09-16 13:44:20 -04:00
Peter Dietz
391fbb47b4 Add stats-log-importer-elasticsearch utility to launcher 2012-09-16 13:44:20 -04:00
Peter Dietz
f00db44cf3 ES stats-import explicitly uses a transport-client
Plus:
- A bug fix where we only execute a bulk-data post, when we have a payload
- Remove userAgent from data, since we can't obtain from dspace.log
2012-09-16 13:44:20 -04:00
Peter Dietz
21fdd99bb9 Simplify ES client creation (Node, Local, Transport), and default to Node
Changed default client to be NodeClient so we can listen to IP transport.
2012-09-16 13:44:20 -04:00
Peter Dietz
f6e495797c Add sonatype-releases repository for Elastic Search
The elasticsearch jar was in my .m2/repository, after clearing that, I
realized I need to add the sonatype repository.
2012-09-16 13:44:20 -04:00
Peter Dietz
3bc6702fe0 Excluding jcl-over-slf4j from sneaking into dependencies
If two slf4j versions (1.6 and 1.5) get into the project, it causes
version mismatches, and you get a dreaded error like:
java.lang.NoSuchMethodError: org.slf4j.spi.LocationAwareLogger.log

Somehow the version bumps I've added to lucene, or other dependencies I've
added have caused slf4j to import jcl-over-slf4j (version 1.6). This fixes
that.
2012-09-16 13:39:58 -04:00
Peter Dietz
66a1295598 Add DSpace licensing to contributed code
mvn install had complained about these files.
2012-09-16 13:39:57 -04:00
Peter Dietz
49f4a64c76 Create importer to ingest dspace.log usages events to ES 2012-09-16 13:39:57 -04:00
Peter Dietz
2bada688af Proof of concept convert ES response to a neutral data object to spit out JSON
Created a class called DataTermsFacet, which holds list of term:count pairs.
2012-09-16 13:39:57 -04:00
Peter Dietz
9cc784458d Provide a link to the view-elastic-search statsitics view 2012-09-16 13:39:57 -04:00
Peter Dietz
8a6cf16416 DS-1241 Modifying the dashboard theme to have working JS and CSS
Currently wiring the dashboard theme to copy-in the style.css that
Reference uses.
2012-09-16 13:39:57 -04:00
Peter Dietz
ee6753fcfc DS-1241 Elastic Search Statistics - Put Mapping/Schema 2012-09-16 13:39:57 -04:00
Peter Dietz
59d1970f1c DS-1241 Statistics Implementation in Elastic Search
Copied in Implementation of Elastic Search, and wired it into DSpace.
I changed the ES Node to be a nodeClient, and also one that runs locally
within tomcat's JVM. For OSU, we had used either transport-client, or
node-client, and both of which required that the server also be running a
seperate elastic search instance. By bundling this into DSpace, it should
make this a bit more turn-key to get started using Elastic Search.

By default, Elastic Search is ON with this commit.
2012-09-16 13:39:57 -04:00
Andrea Bollini
3b1cc06e0d add missing license headers in files from DS-1217 2012-09-15 15:41:53 +02:00
Lyncode
7d033d8cd2 Version 2.2.4 of XOAI integrated. 2012-09-15 09:19:40 +01:00
Elias Tzoc
449c7f9dd9 DS-1017: XMLUI mobile theme - initial contribution 2012-09-15 00:07:56 +02:00
lyncodev
8fc3c3e76e GetRecord bug solved 2012-09-14 19:53:31 +01:00
Mark H. Wood
83e8e9d541 Merge pull request #5 from mwoodiupui/DSRV-22
[DSRV-22] Detect indirect circular property references
2012-09-14 08:33:04 -07:00
Nestor Oviedo
97580ee023 Merge pull request #80 from sedici/DS-1244
[DS-1244] XMLUI's OpenSearch implementation refactored to work with Discovery

Squashed commit of the following:

commit 1268c9af08018afb46d213910d8a96c79d20715c
Author: Andrea Bollini <bollini@cilea.it>
Date:   Fri Sep 14 16:11:02 2012 +0200

    Fix JSPUI side to work with new classes

    also included some bug fix about I18N access in Open Search for JSPUI

commit 885012fcf32943dc1ce2ac7f35bb3810f70363aa
Merge: 12b4d6b d8b1b4c
Author: Andrea Bollini <bollini@cilea.it>
Date:   Fri Sep 14 15:28:09 2012 +0200

    Merge remote-tracking branch 'sedici/open-search-discovery' into DS-1244

commit d8b1b4ccfe
Merge: 53ad4e3 58fe789
Author: Nestor Oviedo <nestor@pc-nestor.(none)>
Date:   Thu Sep 13 13:50:03 2012 -0300

    Merge remote-tracking branch 'origin/open-search-discovery' into open-search-discovery

    Conflicts:
    	dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/OpenSearchServlet.java

    Rebase with 7bc92a81ca
    Conflict on dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/OpenSearchServlet.java resolved: new version preserved

commit 53ad4e36c6
Author: nestor <nestor@pc-nestor>
Date:   Thu Sep 13 10:27:32 2012 -0300

    Added license header to DiscoveryOpenSearchGenerator

commit bdb22e0aba
Author: nestor <nestor@pc-nestor>
Date:   Thu Sep 6 13:36:01 2012 -0300

    DS-1244 - XMLUI's OpenSearch implementation refactored.
    It's in order to use either PostgreSQL's indexes or Discovery services
    based on the requested URL

commit 58fe789f80
Author: nestor <nestor@pc-nestor>
Date:   Thu Sep 13 10:27:32 2012 -0300

    Added license header to DiscoveryOpenSearchGenerator

commit efbf7d2126
Author: nestor <nestor@pc-nestor>
Date:   Thu Sep 6 13:36:01 2012 -0300

    DS-1244 - XMLUI's OpenSearch implementation refactored.
    It's in order to use either PostgreSQL's indexes or Discovery services
    based on the requested URL
2012-09-14 16:24:34 +02:00
EKT
12b4d6b296 Merge pull request #49 from EKT/DS-1236
DS-1236 Auto update advance search drop down lists from configuration file

Squashed commit of the following:

commit 612ac62f740fc26cd10d8a338db3537c49b3d4bd
Author: Andrea Bollini <bollini@cilea.it>
Date:   Fri Sep 14 10:38:05 2012 +0200

    I18N fix, improved configuration and code readability

    included the default index in the configuration
    refactored the jsp to reduce code for backward compatibility
    fixed messages.properties key to use a common strategy to derive it
    from the search index

commit 81b3da293e
Author: EKT <kstamatis@ekt.gr>
Date:   Fri Sep 14 08:43:33 2012 +0300

    Conflicts:
    	dspace/config/dspace.cfg
2012-09-14 10:54:11 +02:00
Lyncode
85a5d8daab Single Item Filtering corrected. 2012-09-13 18:52:32 +01:00
EKT
7bc92a81ca Merge pull request #48 from EKT/DS-1228
DS-1228 Concatenate values of multi-value fields in item display

Squashed commit of the following:

commit 79f87c3e2fcf00dd3aa7e2b5f4a5bc88d0482da1
Author: Andrea Bollini <bollini@cilea.it>
Date:   Thu Sep 13 16:36:16 2012 +0200

    fixed indentation and compilation error (missing ;)

commit 4ad5a517e3755de620e49e2f8be020089dba624b
Merge: 8115be2 7f287cf
Author: Andrea Bollini <bollini@cilea.it>
Date:   Thu Sep 13 16:30:37 2012 +0200

    Merge remote-tracking branch 'EKT/DS-1228' into DS-1228

commit 7f287cfd14
Author: EKT <kstamatis@ekt.gr>
Date:   Mon Sep 10 13:38:22 2012 +0300

    Remove configuration for including space - change configuration option name

commit 8bfd621d10
Author: EKT <kstamatis@ekt.gr>
Date:   Mon Aug 6 15:06:40 2012 +0300

    Add option to concatenate multiple values in item display instead of line break
2012-09-13 16:47:31 +02:00
abollini
8115be2c37 Merge pull request #60 from abollini/DS-1217
DS-1217 Porting Discovery to the JSPUI
2012-09-13 03:40:57 -07:00
Andrea Bollini
4fc8b9348b DS-1217 Porting Discovery to the JSPUI
Contribution from CILEA funded by the Hub project from HKU
(http://hub.hku.hk)
Faceting, filtering (autocomplete), sidebar facet for the site home page,
community and collections are all implemented.
Changes to the Discovery API/configuration:
  1) changed the unique field for the SOLR document, now is used the
     concatenation of ID and TYPE-ID (in future we want to index also
     object that have not an handle)
  2) the prune query has been changed in search.resourcetype:[2 TO 4] so to          not remove eventually extra data loaded in the SOLR search core
  3) added defaultRpp parameter

Main differences from the XMLUI implementation:
  1) facets doesn't have a "...More" link but there are pagination to
     scroll facet in the context (search, home page, community, etc.)
  2) facets doesn't show the values already selected
  3) autocomplete is done against user input and does not dump all the
     values (this was a performance issue in XMLUI < 3.0, with 90k items
     I see JSON around 2Mb). With the new Discovery improvements the
     autocomplete feature in XMLUI seems to be turned off
  4) to enable JSPUI discovery you need to add some extra plugins in
     dspace.cfg (instructions are provided as comment in the discovery.cfg)
2012-09-13 12:31:23 +02:00
Ivan Masár
21f93a34d4 fix obvious mistake: merge two DB upgrade scripts 2012-09-10 22:54:04 +02:00
helix84
0540864426 Merge pull request #73 from helix84/DS-1084
[DS-1084] authority field in Batch Metadata Editor
2012-09-10 07:46:50 -07:00
Ivan Masár
462011ffe6 [DS-1084] authority field in Batch Metadata Editor (squashed) 2012-09-10 15:28:05 +02:00
abollini
0a62de7a2f Merge pull request #67 from abollini/DS-1218
DS-1218 BrowseDAO based on discovery
2012-09-08 07:08:46 -07:00
Andrea Bollini
8bb68ddc81 DS-1218 BrowseDAO based on discovery
This contribution is supported by the University of Hong Kong that has
    adopted the first version of this code since July 2010
    Software development by the CILEA SURplus Team (http://www.cilea.it)

    This is a full featured provider for the DSpace Browse System that read
    data from the Discovery Search SOLR core.
    The browse supports:
    - all the actual browse system configuration options (item and metadata
    browse, pagination, sorting)
    - browse of withdrawn items
    - browse of private items (XMLUI only)
    - search for authors used in the item mapper tool

    Major changes:
    - add two new search methods to the SearchService that allow you to
    specify if you want or not withdrawn items in your result. The old
    methods just call these new methods asking for no withdrawn item (this
    assure backcompatiliby)
    - the SearchServiceImpl now index also withdrawn item, new SolrDoc field
    "withdrawn"
    - DiscoverResult.Facet now keep information also about authority so
    that is possible distinct facets related to homonyms authors, etc.
    (this feature can be disabled in the discovery.cfg)
    - changed the schema.xml the default should be to ignore field if not
    otherwise specified (see also below)
    - better support for projection, metadata are stored (not indexed) with
    all related informations attached (authority, language). Metadata to
    store for projection can be defined in the discovery.cfg

    Other notes:
    - SolrBrowseDAO/SolrCreateBrowseDAO use settings defined in the main
    dspace.cfg (the browse section) this mean that sorting configuration is
    not related to the discovery search sorting etc.
    - Browse consumer should be disabled (if not only overhead but it still
    works), the actual index work is done using the Discovery "plugin"
    SolrServiceIndexPlugin (configurated via spring)
    - SolrCreateBrowseDAO is able to remove the old tables created by the
    DBMS DAO implementations simply using the browse command line script
    (dspace index -d -f)
    - to build the browse index it is required to run the discovery index
    client (dspace update-discovery-index -b)
2012-09-08 15:53:50 +02:00
nestor
139b2d4b2e DS-1023 - Patch to allow linebreaks in <textarea> boxes 2012-09-06 15:40:24 -03:00
Ivan Masár
7407de5c52 improve some Javadoc 2012-09-05 16:24:48 +02:00
Mark H. Wood
38be7a0235 Test handling of indirect circular references 2012-09-04 13:29:56 -04:00
Mark H. Wood
ae5af99fe2 Fix SCM section URLs to point to dspace-services, not DSpace 2012-09-04 11:53:41 -04:00