Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '6.x' of https://github.com/Islandora/islandora into 6.x

  • Loading branch information...
commit c271eb9b90bb82d96079f7761e9003abe42a781d 2 parents 9dedcb5 + ef6187e
@ruebot authored
View
4 CollectionClass.inc
@@ -54,13 +54,11 @@ class CollectionClass {
}
protected static function getDefaultCollectionQuery($pid) {
- return 'select $object $title $content from <#ri>
+ return 'select $object $title from <#ri>
where ($object <fedora-model:label> $title
- and $object <fedora-model:hasModel> $content
and ($object <fedora-rels-ext:isMemberOfCollection> <info:fedora/' . $pid . '>
or $object <fedora-rels-ext:isMemberOf> <info:fedora/' . $pid . '>)
and $object <fedora-model:state> <info:fedora/fedora-system:def/model#Active>)
- minus $content <mulgara:is> <info:fedora/fedora-system:FedoraObject-3.0>
order by $title';
}
View
4 api/fedora_item.inc
@@ -1118,7 +1118,9 @@ RDF;
$created_temp = TRUE;
}
- $file_url = file_create_url($file);
+ $parts = explode(DIRECTORY_SEPARATOR, $file);
+ $parts = array_map('rawurlencode', $parts);
+ $file_url = file_create_url(implode(DIRECTORY_SEPARATOR, $parts));
$toReturn = $this->modify_datastream_by_reference($file_url, $dsid, $label, $mime_type, $force, $logMessage);
View
4 api/tuque.inc
@@ -2,7 +2,7 @@
$islandora_module_path = drupal_get_path('module', 'fedora_repository');
-//do this until we expost these in a module or library
+//do this until we export these in a module or library
@include_once 'sites/all/libraries/tuque/Datastream.php';
@include_once 'sites/all/libraries/tuque/FedoraApi.php';
@include_once 'sites/all/libraries/tuque/FedoraApiSerializer.php';
@@ -67,7 +67,7 @@ class IslandoraTuque {
}
if (!isset($url)) {
- $url = variable_get('islandora_base_url', 'http://localhost:8080/fedora');
+ $url = variable_get('fedora_base_url', 'http://localhost:8080/fedora');
}
if(self::exists()) {
View
14 xsl/sparql_to_html.xsl
@@ -90,8 +90,6 @@
<xsl:template match="s:result">
<xsl:variable name='OBJECTURI' select="s:object/@uri"/>
- <xsl:variable name='CONTENTURI' select="s:content/@uri"/>
- <xsl:variable name='CONTENTMODEL' select="substring-after($CONTENTURI,'/')"/>
<xsl:variable name='PID' select="substring-after($OBJECTURI,'/')"/>
<xsl:variable name="newTitle" >
<xsl:call-template name="replace-string">
@@ -103,17 +101,9 @@
<xsl:variable name="cleanTitle" select="php:functionString('fedora_repository_urlencode_string', $newTitle)"/>
<xsl:variable name="linkUrl">
- <xsl:choose>
- <xsl:when test="($CONTENTMODEL='islandora:collectionCModel')">
+
<xsl:value-of select="php:functionString('url', concat('fedora/repository/', $PID, '/-/collection'))"/>
- </xsl:when>
- <xsl:otherwise>
- <!--the below is an example of going straight to a datastream instead of the details page.
- <xsl:value-of select="$BASEURL"/>/fedora/repository/<xsl:copy-of select="$PID"/>/OBJ/<xsl:value-of select="s:title"/>-->
- <xsl:value-of select="php:functionString('url', concat('fedora/repository/', $PID))"/>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:value-of select="s:content"/>
+
</xsl:variable>
<td valign="top" width="25%">
<a>
Please sign in to comment.
Something went wrong with that request. Please try again.