Commit 28fc55c8 authored by Yann Mombrun's avatar Yann Mombrun

WEBLAB-1319 - Bump to stable version 2.1.3.

Just add dct:source in the list of metadata and fix a bit the ordering of the metadata in the jsp

git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/trunk/WebLabServices/Portlets/metadata-portlet@3960 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent 2da92132
......@@ -5,11 +5,12 @@
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>parent</artifactId>
<version>1.2.6</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>weblab-metaview</artifactId>
<version>2.1.3-SNAPSHOT</version>
<version>2.1.3</version>
<packaging>war</packaging>
<name>WebLab Metaview</name>
......
......@@ -4,42 +4,43 @@ portlet.title = Metadata view
portlet.warning.session_expired = Session expired
meta.defaultTitle = Title unavailable
meta.metadata = meta-data
meta.hasNativeContent = Native Content&nbsp;:
meta.hasNormalisedContent = Normalised Content&nbsp;:
meta.isGeneratedFrom = Generated from&nbsp;:
meta.isProducedFrom = Produced from&nbsp;:
meta.isResultOf = Result of&nbsp;:
meta.hasNumberOfResults = Number of results&nbsp;:
meta.isExposedAs = Exposed as&nbsp;:
meta.title = Title&nbsp;:
meta.creator = Creator&nbsp;:
meta.abstract = Summary&nbsp;:
meta.catego = Category&nbsp;:
meta.subject = Subject&nbsp;:
meta.description = Description&nbsp;:
meta.publisher = Publisher&nbsp;:
meta.contibutor = Contributor&nbsp;:
meta.date = Date&nbsp;:
meta.type = Type&nbsp;:
meta.format = Format&nbsp;:
meta.identifier = Identifier&nbsp;:
meta.source = Source&nbsp;:
meta.language = Language&nbsp;:
meta.relation = Relation&nbsp;:
meta.coverage = Coverage&nbsp;:
meta.right = Right&nbsp;:
meta.modified = Modification date&nbsp;:
meta.created = Creation date&nbsp;:
meta.hasRank = Rank&nbsp;:
meta.hasDescription = Description&nbsp;:
meta.hasScore = Score&nbsp;:
meta.gatheringDate = Gathering date&nbsp;:
meta.extent = Media extension&nbsp;:
meta.projectName = Crawling project name&nbsp;:
meta.hasOriginalFileSize = Original file size&nbsp;:
meta.refersTo = Refers to&nbsp;:
meta.seeAlso = See also&nbsp;:
meta.availableTranslations = Translations&nbsp;:
meta.hasNativeContent = Native Content:
meta.hasNormalisedContent = Normalised Content:
meta.isGeneratedFrom = Generated from:
meta.isProducedFrom = Produced from:
meta.isResultOf = Result of:
meta.hasNumberOfResults = Number of results:
meta.isExposedAs = Exposed as:
meta.title = Title:
meta.creator = Creator:
meta.abstract = Summary:
meta.catego = Category:
meta.subject = Subject:
meta.description = Description:
meta.publisher = Publisher:
meta.contibutor = Contributor:
meta.date = Date:
meta.type = Type:
meta.format = Format:
meta.identifier = Identifier:
meta.source = Source:
meta.mainsource = Gathering seed:
meta.language = Language:
meta.relation = Relation:
meta.coverage = Coverage:
meta.right = Right:
meta.modified = Modification date:
meta.created = Creation date:
meta.hasRank = Rank:
meta.hasDescription = Description:
meta.hasScore = Score:
meta.gatheringDate = Gathering date:
meta.extent = Media extension:
meta.projectName = Crawling project name:
meta.hasOriginalFileSize = Original file size:
meta.refersTo = Refers to:
meta.seeAlso = See also:
meta.availableTranslations = Translations:
meta.originalLanguageVersion = Original version
......
......@@ -24,6 +24,7 @@ meta.type = Type:
meta.format = Format:
meta.identifier = Identifier:
meta.source = Source:
meta.source = Gathering seed:
meta.language = Language:
meta.relation = Relation:
meta.coverage = Coverage:
......
......@@ -23,6 +23,7 @@ meta.type = Type de document&nbsp;:
meta.format = Format&nbsp;:
meta.identifier = Identifiant&nbsp;:
meta.source = Source&nbsp;:
meta.mainsource = Source de collecte&nbsp;:
meta.language = Langue&nbsp;:
meta.relation = Relation&nbsp;:
meta.coverage = Couverture spatiale ou temporelle&nbsp;:
......
......@@ -42,6 +42,7 @@ when possible (as meta-data).
<entry key="modified" value="http://purl.org/dc/terms/modified" />
<entry key="created" value="http://purl.org/dc/terms/created" />
<entry key="extent" value="http://purl.org/dc/terms/extent" />
<entry key="mainsource" value="http://purl.org/dc/terms/source" />
<!-- RDF properties -->
<entry key="seeAlso" value="http://www.w3.org/2000/01/rdf-schema#seeAlso" />
......@@ -75,13 +76,14 @@ when possible (as meta-data).
<entry key="date" value="false" />
<entry key="type" value="true" />
<entry key="format" value="true" />
<entry key="identifier" value="true" />
<entry key="identifier" value="false" />
<entry key="source" value="true" />
<entry key="language" value="true" />
<entry key="coverage" value="false" />
<entry key="modified" value="true" />
<entry key="created" value="true" />
<entry key="extent" value="true" />
<entry key="mainsource" value="true" />
<!-- RDF properties -->
<entry key="seeAlso" value="false" />
......
......@@ -39,78 +39,173 @@ jQuery('.warnUserOnClick').live("click", function() {
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['hasScore'] && weblab:hasValue(resource, rdfProperties['hasScore'])}">
<tr>
<th>
<fmt:message key="meta.hasScore" />
</th>
<td>
<i><weblab:getPropertyValues uri="${rdfProperties['hasScore'] }"/></i>
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['hasNativeContent'] && weblab:hasValue(resource, rdfProperties['hasNativeContent'])}">
<tr>
<th>
<fmt:message key="meta.hasNativeContent" />
</th>
<td>
<i><weblab:getPropertyValues uri="${rdfProperties['hasNativeContent'] }"/></i>
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['hasNormalisedContent'] && weblab:hasValue(resource, rdfProperties['hasNormalisedContent'])}">
<c:if test="${metaDisplay['source'] && weblab:hasValue(resource, rdfProperties['source'])}">
<tr>
<th>
<fmt:message key="meta.hasNormalisedContent" />
<fmt:message key="meta.source" />
</th>
<td>
<i><weblab:getPropertyValues uri="${rdfProperties['hasNormalisedContent'] }"/></i>
<weblab:renderValues style="anchor" cssClass="meta_link warnUserOnClick">
<weblab:getPropertyValues uri="${rdfProperties['source'] }"/>
</weblab:renderValues>
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['isExposedAs'] && weblab:hasValue(resource, rdfProperties['isExposedAs'])}">
<c:if test="${metaDisplay['mainsource'] && weblab:hasValue(resource, rdfProperties['mainsource'])}">
<tr>
<th>
<fmt:message key="meta.isExposedAs" />
<fmt:message key="meta.mainsource" />
</th>
<td>
<weblab:renderValues style="anchor" cssClass="meta_link">
${pageContext.request.scheme}://${pageContext.request.serverName}:${pageContext.request.serverPort}<weblab:getPropertyValues uri="${rdfProperties['isExposedAs'] }"/>
<weblab:renderValues style="anchor" cssClass="meta_link warnUserOnClick">
<weblab:getPropertyValues uri="${rdfProperties['mainsource'] }"/>
</weblab:renderValues>
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['isGeneratedFrom'] && weblab:hasValue(resource, rdfProperties['isGeneratedFrom'])}">
<c:if test="${metaDisplay['format'] && weblab:hasValue(resource, rdfProperties['format'])}">
<tr>
<th>
<fmt:message key="meta.isGeneratedFrom" />
<fmt:message key="meta.format" />
</th>
<td>
<i><weblab:getPropertyValues uri="${rdfProperties['isGeneratedFrom'] }"/></i>
<weblab:renderValues style="icon+text" cssClass="meta_data_formatIconText">
<weblab:getPropertyValues uri="${rdfProperties['format'] }"/>
</weblab:renderValues>
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['abstract'] && weblab:hasValue(resource, rdfProperties['abstract'])}">
<c:if test="${metaDisplay['language'] && weblab:hasValue(resource, rdfProperties['language'])}">
<tr>
<th>
<fmt:message key="meta.abstract" />
<fmt:message key="meta.language" />
</th>
<td>
<i><weblab:getPropertyValues uri="${rdfProperties['abstract'] }"/></i>
<weblab:renderValues style="icon+text" cssClass="meta_data_formatIconText">
<weblab:getPropertyValues uri="${rdfProperties['language'] }"/>
</weblab:renderValues>
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['isProducedFrom'] && weblab:hasValue(resource, rdfProperties['isProducedFrom'])}">
<c:if test="${metaDisplay['translation'] && !empty(translations)}">
<tr>
<th>
<fmt:message key="meta.isProducedFrom" />
<fmt:message key="meta.availableTranslations" />
</th>
<td>
<i><weblab:getPropertyValues uri="${rdfProperties['isProducedFrom'] }"/></i>
<portlet:actionURL var="selectOriginalVersion">
<portlet:param name="action" value="selectOriginalVersion" />
</portlet:actionURL>
<a href="${selectOriginalVersion }">
<weblab:renderValues style="icon" cssClass="meta_data_formatIconText">
<weblab:getPropertyValues uri="${rdfProperties['language'] }"/>
</weblab:renderValues><fmt:message key="meta.originalLanguageVersion" />
</a>
<br/>
<br/>
<i>
<c:forEach var="translation" items="${translations }" varStatus="status">
<c:if test="${status.count != 1}">
<br/>
</c:if>
<portlet:actionURL var="selectTranslation">
<portlet:param name="action" value="selectTranslation" />
<portlet:param name="language" value="${translation.key }" />
<portlet:param name="service" value="${translation.value.uri}" />
</portlet:actionURL>
<a href="${selectTranslation }">
<weblab:renderValues style="icon+text" cssClass="meta_data_formatIconText">
${translation.key }
</weblab:renderValues></a>(${translation.value.label })
</c:forEach>
</i>
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['created'] && weblab:hasValue(resource, rdfProperties['created'])}">
<weblab:getPropertyValues uri="${rdfProperties['created'] }" var="createdDates"/>
<c:set var="createdDatesStr" value="" />
<c:forEach items="${createdDates}" var="createdDate" varStatus="createdDateStatus">
<c:if test="${createdDateStatus.count != 1}">
<c:set var="createdDatesStr" value="${createdDatesStr}<br />" />
</c:if>
<c:catch var="createdDatesError">
<fmt:formatDate value="${createdDate}" type="BOTH" dateStyle="FULL" var="createdDateStr" />
<c:set var="createdDatesStr" value="${createdDatesStr}${createdDateStr}" />
</c:catch>
</c:forEach>
<c:if test="${createdDatesError == null}">
<tr>
<th>
<fmt:message key="meta.created" />
</th>
<td>
<i>
<c:out value="${createdDatesStr}" />
</i>
</td>
</tr>
</c:if>
</c:if>
<c:if test="${metaDisplay['modified'] && weblab:hasValue(resource, rdfProperties['modified'])}">
<weblab:getPropertyValues uri="${rdfProperties['modified'] }" var="modifiedDates"/>
<c:set var="modifiedDatesStr" value="" />
<c:forEach items="${modifiedDates}" var="modifiedDate" varStatus="modifiedDateStatus">
<c:if test="${modifiedDateStatus.count != 1}">
<c:set var="modifiedDatesStr" value="${modifiedDatesStr}<br />" />
</c:if>
<c:catch var="modifiedDatesError">
<fmt:formatDate value="${modifiedDate}" type="BOTH" dateStyle="FULL" var="modifiedDateStr" />
<c:set var="modifiedDatesStr" value="${modifiedDatesStr}${modifiedDateStr}" />
</c:catch>
</c:forEach>
<c:if test="${modifiedDatesError == null}">
<tr>
<th>
<fmt:message key="meta.modified" />
</th>
<td>
<i>
<c:out value="${modifiedDatesStr}" />
</i>
</td>
</tr>
</c:if>
</c:if>
<c:if test="${metaDisplay['gatheringDate'] && weblab:hasValue(resource, rdfProperties['gatheringDate'])}">
<weblab:getPropertyValues uri="${rdfProperties['gatheringDate'] }" var="gatheringDates"/>
<c:set var="gatheringDatesStr" value="" />
<c:forEach items="${gatheringDates}" var="gatheringDate" varStatus="gatheringDateStatus">
<c:if test="${gatheringDateStatus.count != 1}">
<c:set var="gatheringDatesStr" value="${gatheringDatesStr}<br />" />
</c:if>
<c:catch var="gatheringDatesError">
<fmt:formatDate value="${gatheringDate}" type="BOTH" dateStyle="FULL" var="gatheringDateStr" />
<c:set var="gatheringDatesStr" value="${gatheringDatesStr}${gatheringDateStr}" />
</c:catch>
</c:forEach>
<c:if test="${gatheringDatesError == null}">
<tr>
<th>
<fmt:message key="meta.gatheringDate" />
</th>
<td>
<i>
<c:out value="${gatheringDatesStr}" />
</i>
</td>
</tr>
</c:if>
</c:if>
<c:if test="${metaDisplay['creator'] && weblab:hasValue(resource, rdfProperties['creator'])}">
<tr>
<th>
......@@ -162,62 +257,98 @@ jQuery('.warnUserOnClick').live("click", function() {
</tr>
</c:if>
</c:if>
<c:if test="${metaDisplay['description'] && weblab:hasValue(resource, rdfProperties['description'])}">
<c:if test="${metaDisplay['identifier'] && weblab:hasValue(resource, rdfProperties['identifier'])}">
<tr>
<th>
<fmt:message key="meta.description" />
<fmt:message key="meta.identifier" />
</th>
<td>
<i><weblab:getPropertyValues uri="${rdfProperties['description'] }"/></i>
<i><weblab:getPropertyValues uri="${rdfProperties['identifier'] }"/></i>
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['format'] && weblab:hasValue(resource, rdfProperties['format'])}">
<c:if test="${metaDisplay['hasScore'] && weblab:hasValue(resource, rdfProperties['hasScore'])}">
<tr>
<th>
<fmt:message key="meta.hasScore" />
</th>
<td>
<i><weblab:getPropertyValues uri="${rdfProperties['hasScore'] }"/></i>
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['hasNativeContent'] && weblab:hasValue(resource, rdfProperties['hasNativeContent'])}">
<tr>
<th>
<fmt:message key="meta.hasNativeContent" />
</th>
<td>
<i><weblab:getPropertyValues uri="${rdfProperties['hasNativeContent'] }"/></i>
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['hasNormalisedContent'] && weblab:hasValue(resource, rdfProperties['hasNormalisedContent'])}">
<tr>
<th>
<fmt:message key="meta.format" />
<fmt:message key="meta.hasNormalisedContent" />
</th>
<td>
<weblab:renderValues style="icon+text" cssClass="meta_data_formatIconText">
<weblab:getPropertyValues uri="${rdfProperties['format'] }"/>
<i><weblab:getPropertyValues uri="${rdfProperties['hasNormalisedContent'] }"/></i>
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['isExposedAs'] && weblab:hasValue(resource, rdfProperties['isExposedAs'])}">
<tr>
<th>
<fmt:message key="meta.isExposedAs" />
</th>
<td>
<weblab:renderValues style="anchor" cssClass="meta_link">
${pageContext.request.scheme}://${pageContext.request.serverName}:${pageContext.request.serverPort}<weblab:getPropertyValues uri="${rdfProperties['isExposedAs'] }"/>
</weblab:renderValues>
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['identifier'] && weblab:hasValue(resource, rdfProperties['identifier'])}">
<c:if test="${metaDisplay['isGeneratedFrom'] && weblab:hasValue(resource, rdfProperties['isGeneratedFrom'])}">
<tr>
<th>
<fmt:message key="meta.identifier" />
<fmt:message key="meta.isGeneratedFrom" />
</th>
<td>
<i><weblab:getPropertyValues uri="${rdfProperties['identifier'] }"/></i>
<i><weblab:getPropertyValues uri="${rdfProperties['isGeneratedFrom'] }"/></i>
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['language'] && weblab:hasValue(resource, rdfProperties['language'])}">
<c:if test="${metaDisplay['abstract'] && weblab:hasValue(resource, rdfProperties['abstract'])}">
<tr>
<th>
<fmt:message key="meta.language" />
<fmt:message key="meta.abstract" />
</th>
<td>
<weblab:renderValues style="icon+text" cssClass="meta_data_formatIconText">
<weblab:getPropertyValues uri="${rdfProperties['language'] }"/>
</weblab:renderValues>
<i><weblab:getPropertyValues uri="${rdfProperties['abstract'] }"/></i>
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['source'] && weblab:hasValue(resource, rdfProperties['source'])}">
<c:if test="${metaDisplay['isProducedFrom'] && weblab:hasValue(resource, rdfProperties['isProducedFrom'])}">
<tr>
<th>
<fmt:message key="meta.source" />
<fmt:message key="meta.isProducedFrom" />
</th>
<td>
<weblab:renderValues style="anchor" cssClass="meta_link warnUserOnClick">
<weblab:getPropertyValues uri="${rdfProperties['source'] }"/>
</weblab:renderValues>
<i><weblab:getPropertyValues uri="${rdfProperties['isProducedFrom'] }"/></i>
</td>
</tr>
</c:if>
</c:if>
<c:if test="${metaDisplay['description'] && weblab:hasValue(resource, rdfProperties['description'])}">
<tr>
<th>
<fmt:message key="meta.description" />
</th>
<td>
<i><weblab:getPropertyValues uri="${rdfProperties['description'] }"/></i>
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['subject'] && weblab:hasValue(resource, rdfProperties['subject'])}">
<tr>
<th>
......@@ -290,81 +421,6 @@ jQuery('.warnUserOnClick').live("click", function() {
</td>
</tr>
</c:if>
<c:if test="${metaDisplay['created'] && weblab:hasValue(resource, rdfProperties['created'])}">
<weblab:getPropertyValues uri="${rdfProperties['created'] }" var="createdDates"/>
<c:set var="createdDatesStr" value="" />
<c:forEach items="${createdDates}" var="createdDate" varStatus="createdDateStatus">
<c:if test="${createdDateStatus.count != 1}">
<c:set var="createdDatesStr" value="${createdDatesStr}<br />" />
</c:if>
<c:catch var="createdDatesError">
<fmt:formatDate value="${createdDate}" type="BOTH" dateStyle="FULL" var="createdDateStr" />
<c:set var="createdDatesStr" value="${createdDatesStr}${createdDateStr}" />
</c:catch>
</c:forEach>
<c:if test="${createdDatesError == null}">
<tr>
<th>
<fmt:message key="meta.created" />
</th>
<td>
<i>
<c:out value="${createdDatesStr}" />
</i>
</td>
</tr>
</c:if>
</c:if>
<c:if test="${metaDisplay['modified'] && weblab:hasValue(resource, rdfProperties['modified'])}">
<weblab:getPropertyValues uri="${rdfProperties['modified'] }" var="modifiedDates"/>
<c:set var="modifiedDatesStr" value="" />
<c:forEach items="${modifiedDates}" var="modifiedDate" varStatus="modifiedDateStatus">
<c:if test="${modifiedDateStatus.count != 1}">
<c:set var="modifiedDatesStr" value="${modifiedDatesStr}<br />" />
</c:if>
<c:catch var="modifiedDatesError">
<fmt:formatDate value="${modifiedDate}" type="BOTH" dateStyle="FULL" var="modifiedDateStr" />
<c:set var="modifiedDatesStr" value="${modifiedDatesStr}${modifiedDateStr}" />
</c:catch>
</c:forEach>
<c:if test="${modifiedDatesError == null}">
<tr>
<th>
<fmt:message key="meta.modified" />
</th>
<td>
<i>
<c:out value="${modifiedDatesStr}" />
</i>
</td>
</tr>
</c:if>
</c:if>
<c:if test="${metaDisplay['gatheringDate'] && weblab:hasValue(resource, rdfProperties['gatheringDate'])}">
<weblab:getPropertyValues uri="${rdfProperties['gatheringDate'] }" var="gatheringDates"/>
<c:set var="gatheringDatesStr" value="" />
<c:forEach items="${gatheringDates}" var="gatheringDate" varStatus="gatheringDateStatus">
<c:if test="${gatheringDateStatus.count != 1}">
<c:set var="gatheringDatesStr" value="${gatheringDatesStr}<br />" />
</c:if>
<c:catch var="gatheringDatesError">
<fmt:formatDate value="${gatheringDate}" type="BOTH" dateStyle="FULL" var="gatheringDateStr" />
<c:set var="gatheringDatesStr" value="${gatheringDatesStr}${gatheringDateStr}" />
</c:catch>
</c:forEach>
<c:if test="${gatheringDatesError == null}">
<tr>
<th>
<fmt:message key="meta.gatheringDate" />
</th>
<td>
<i>
<c:out value="${gatheringDatesStr}" />
</i>
</td>
</tr>
</c:if>
</c:if>
<c:if test="${metaDisplay['projectName'] && weblab:hasValue(resource, rdfProperties['projectName'])}">
<tr>
<th>
......@@ -407,50 +463,6 @@ jQuery('.warnUserOnClick').live("click", function() {
</tr>
</c:if>
<c:if test="${metaDisplay['translation'] && !empty(translations)}">
<tr>
<th>
<fmt:message key="meta.availableTranslations" />
</th>
<td>
<portlet:actionURL var="selectOriginalVersion">
<portlet:param name="action" value="selectOriginalVersion" />
</portlet:actionURL>
<a href="${selectOriginalVersion }">
<weblab:renderValues style="icon" cssClass="meta_data_formatIconText">
<weblab:getPropertyValues uri="${rdfProperties['language'] }"/>
</weblab:renderValues><fmt:message key="meta.originalLanguageVersion" />
</a>
<br/>
<br/>
<i>
<c:forEach var="translation" items="${translations }" varStatus="status">
<c:if test="${status.count != 1}">
<br/>
</c:if>
<portlet:actionURL var="selectTranslation">
<portlet:param name="action" value="selectTranslation" />
<portlet:param name="language" value="${translation.key }" />
<portlet:param name="service" value="${translation.value.uri}" />
</portlet:actionURL>
<a href="${selectTranslation }">
<weblab:renderValues style="icon+text" cssClass="meta_data_formatIconText">
${translation.key }
</weblab:renderValues></a>(${translation.value.label })
</c:forEach>
</i>
</td>
</tr>
</c:if>
</tbody>
</table>
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment