diff --git a/components/includes/simplecart.inc b/components/includes/simplecart.inc
index 591dad350422a39c960b7460fdd850a11f6ddf7a..ce6d6707543e00529ad49f41a57d0f4014a045d5 100755
--- a/components/includes/simplecart.inc
+++ b/components/includes/simplecart.inc
@@ -30,13 +30,15 @@
<option value="publikasjon">Bruk i publisering - 500kr</option>
</select>
</div>
-</div>
-<div class="row">
- <div class="col-md-6"><span style="margin-top: 8px;" class="item_price"></span></div>
+ </div>
+ <div class="row">
+ <div class="col-md-6">
+ <span style="margin-top: 8px;" class="item_price"></span>
+ </div>
<div style="text-align: right;" class="col-md-6">
<a style="margin-top: 10px;" class="btn btn-default item_add" href="javascript:;"> Legg i handlekurv </a><br>
<a class="btn btn-link" href="/cart.html">GÃ¥ til handlekurven <span style="margin-top: 8px;" class="label label-primary simpleCart_quantity"></span></a>
- </div>
+ </div>
<div class="clearfix"></div>
</div>
</form>
diff --git a/components/services/collections/html.template b/components/services/collections/html.template
index 8bd66b270ac9e0933d80f7a4572d5267808a42f9..c1106b0974f261f8c9e16ceff467b94e00f0e81f 100755
--- a/components/services/collections/html.template
+++ b/components/services/collections/html.template
@@ -16,8 +16,9 @@
<div class="col-md-9">
<h1>Samlinger</h1>
-
+
{% for row in models.main %}
+ <div class="class3"></div>
<div class="row">
<div class="col-md-3 col-sm-3 col-lg-3 hidden-xs">
{% if row.logo %}<a href="{{ row.uri.value }}"><img class="img-circle img-border img-responsive pull-left img-featurette" src="{{ row.logo.value }}"></a>{% endif %}
@@ -30,7 +31,7 @@
</div>
<hr>
{% endfor %}
-
+ <div id="test2"></div>
</div>
</div>
diff --git a/components/services/exhibitions/queries/main.query b/components/services/exhibitions/queries/main.query
index 82318209e84d014a1f766ce74c0fb44bf2bf4ab1..1d71a64ff72d517ec76403b142e81d6f5784bde4 100644
--- a/components/services/exhibitions/queries/main.query
+++ b/components/services/exhibitions/queries/main.query
@@ -1,65 +1,65 @@
SELECT DISTINCT ?uri ?label ?description ?logo ?alternative WHERE {
GRAPH <urn:x-arq:UnionGraph> {
- ?uri a ubbont:Exhibition .
- ?uri ubbont:showWeb true .
- OPTIONAL { ?uri ubbont:sequenceNr ?seq . }
- OPTIONAL { ?uri rdfs:label ?label . }
- OPTIONAL { ?uri dct:title ?label . }
- OPTIONAL { ?uri dct:alternative ?alternative . }
- OPTIONAL { ?uri dct:description ?description . }
- OPTIONAL { ?uri foaf:logo ?logo . }
- NOT EXISTS { ?uri dct:isPartOf ?partOf . }
- FILTER ( ?uri != <http://data.ub.uib.no/exhibition/71fbdd3f-eed9-4dae-a5c8-9b40e7ea45bd>
-# || ?uri != <http://data.ub.uib.no/exhibition/b16328d7-0874-4b42-8053-d5d66b02ca46>
-# || ?uri != <http://data.ub.uib.no/exhibition/53ba51b8-5029-4ac7-a2aa-f47e943d3ff5>
-# || ?uri != <http://data.ub.uib.no/exhibition/65f6e01d-f24b-4232-ab1e-4ca790d6868b>
-# || ?uri != <http://data.ub.uib.no/exhibition/5d9ad83f-73e4-4d8b-8a52-480e2ed76c0d>
-# || ?uri != <http://data.ub.uib.no/exhibition/d36981f7-0d93-4dda-a5be-8d3b104c4958>
-# || ?uri != <http://data.ub.uib.no/exhibition/0e8aa8a9-a166-4cbb-b798-d210e18a506e>
-# || ?uri != <http://data.ub.uib.no/exhibition/e76d5c62-7b20-42c6-aa13-3fc7a243bdb5>
-# || ?uri != <http://data.ub.uib.no/exhibition/60b37d65-a276-4dfd-8e4a-c79a658ddfa3>
-# || ?uri != <http://data.ub.uib.no/exhibition/a16ee11e-2991-42eb-b151-2ee84daf1dda>
-# || ?uri != <http://data.ub.uib.no/exhibition/7da10f07-06ff-40ec-ba8f-fabf458bfa40>
-# || ?uri != <http://data.ub.uib.no/exhibition/5ed032a5-f361-4975-8663-5c00742a5f82>
-# || ?uri != <http://data.ub.uib.no/exhibition/31e3fe62-060d-462e-8310-b296eff383c3>
-# || ?uri != <http://data.ub.uib.no/exhibition/7a84b875-adc2-4587-a82e-1eb76a9e9085>
-# || ?uri != <http://data.ub.uib.no/exhibition/27f422ed-c2fe-41f0-babd-8b8d03ad1f43>
-# || ?uri != <http://data.ub.uib.no/exhibition/6fa3df2f-7333-492b-8478-87cd05c176d9>
-# || ?uri != <http://data.ub.uib.no/exhibition/5ae7b03a-ffaa-4d4c-ad80-8d1df07b4ade>
-# || ?uri != <http://data.ub.uib.no/exhibition/9d0fa899-c984-43f8-b70a-05d688e4d1ed>
-# || ?uri != <http://data.ub.uib.no/exhibition/0d56a8bd-e636-4648-bbac-b892e634185a>
-# || ?uri != <http://data.ub.uib.no/exhibition/6bfc3b67-4342-49ee-b89c-b88553d41549>
-# || ?uri != <http://data.ub.uib.no/exhibition/b1cb5f34-e35f-40f6-9da1-3a6dfed40648>
-# || ?uri != <http://data.ub.uib.no/exhibition/efad7c50-a65a-47c3-9324-2642c47b8251>
-# || ?uri != <http://data.ub.uib.no/exhibition/9ecd4afe-b648-4d5b-b77a-acad40955e5d>
-# || ?uri != <http://data.ub.uib.no/exhibition/eb6bdee1-73a4-4c2e-b22b-b6b320694a6e>
-# || ?uri != <http://data.ub.uib.no/exhibition/437ffaed-9bb7-40d9-b91e-58ac6266ee4b>
-# || ?uri != <http://data.ub.uib.no/exhibition/9d008e6f-5f48-4e66-9909-7340879b67f0>
-# || ?uri != <http://data.ub.uib.no/exhibition/b807a8ab-9f93-4aad-89c6-d1931d948a26>
-# || ?uri != <http://data.ub.uib.no/exhibition/bc91e78d-eef6-4833-8831-c63c066c7268>
-# || ?uri != <http://data.ub.uib.no/exhibition/cd1ecf10-6ec5-449a-8b57-c39b6e29f009>
-# || ?uri != <http://data.ub.uib.no/exhibition/e0511132-e340-4c1f-a5aa-31168be22be5>
-# || ?uri != <http://data.ub.uib.no/exhibition/93fc33e4-c79c-42a1-b7c9-6397c891be85>
-# || ?uri != <http://data.ub.uib.no/exhibition/6e88e615-8687-47bc-bf3f-5ec8fd349bb9>
-# || ?uri != <http://data.ub.uib.no/exhibition/18eed87e-97dc-4d39-8c64-0bedc3c7d900>
-# || ?uri != <http://data.ub.uib.no/exhibition/4b930453-0767-4fd1-8194-618baec0ad85>
-# || ?uri != <http://data.ub.uib.no/exhibition/4adc0168-761d-4b4e-b4ab-56915178f134>
-# || ?uri != <http://data.ub.uib.no/exhibition/1d13e69a-6cf8-4f7b-a67a-2b11cfc82a53>
-# || ?uri != <http://data.ub.uib.no/exhibition/79b00f5c-d123-4ddf-b399-6178c7d1a714>
-# || ?uri != <http://data.ub.uib.no/exhibition/e58aabd5-1c3b-4828-b16d-2647dc9544fa>
-# || ?uri != <http://data.ub.uib.no/exhibition/2bed9e9b-5504-495b-8a01-f889fe1dfd23>
-# || ?uri != <http://data.ub.uib.no/exhibition/d4de00eb-7e90-463b-ad87-cc1c2c0fbb73>
-# || ?uri != <http://data.ub.uib.no/exhibition/006b9d7c-a596-4cfc-a412-dd109cc21052>
-# || ?uri != <http://data.ub.uib.no/exhibition/5d9f5e88-6668-4d63-b8d5-2aeced191daf>
-# || ?uri != <http://data.ub.uib.no/exhibition/7517f821-5911-4541-a64b-ff2dad2087b5>
-# || ?uri != <http://data.ub.uib.no/exhibition/5613c710-b9e4-4da8-ae8e-53d3181064e5>
-# || ?uri != <http://data.ub.uib.no/exhibition/d08b6009-a51c-44e8-a294-156e3d72a9ba>
-# || ?uri != <http://data.ub.uib.no/exhibition/09726e98-5806-404b-82a0-815c056f457c>
-# || ?uri != <http://data.ub.uib.no/exhibition/3743f2ec-20e4-402a-bc85-6b6f8f701b79>
-# || ?uri != <http://data.ub.uib.no/exhibition/27e294b4-a51e-483a-9369-a56ac2e11ef1>
-# || ?uri != <http://data.ub.uib.no/exhibition/f0e0291f-ff11-4b18-8dc2-392c2121b2ac>
-# || ?uri != <http://data.ub.uib.no/exhibition/b3c24277-6a36-4224-887e-63bf35b2663f>
-)
+ ?uri a ubbont:Exhibition .
+ ?uri ubbont:showWeb true .
+ OPTIONAL { ?uri ubbont:sequenceNr ?seq . }
+ OPTIONAL { ?uri rdfs:label ?label . }
+ OPTIONAL { ?uri dct:title ?label . }
+ OPTIONAL { ?uri dct:alternative ?alternative . }
+ OPTIONAL { ?uri dct:description ?description . }
+ OPTIONAL { ?uri foaf:logo ?logo . }
+ NOT EXISTS { ?uri dct:isPartOf ?partOf . }
+ FILTER ( ?uri != <http://data.ub.uib.no/exhibition/71fbdd3f-eed9-4dae-a5c8-9b40e7ea45bd>
+ # || ?uri != <http://data.ub.uib.no/exhibition/b16328d7-0874-4b42-8053-d5d66b02ca46>
+ # || ?uri != <http://data.ub.uib.no/exhibition/53ba51b8-5029-4ac7-a2aa-f47e943d3ff5>
+ # || ?uri != <http://data.ub.uib.no/exhibition/65f6e01d-f24b-4232-ab1e-4ca790d6868b>
+ # || ?uri != <http://data.ub.uib.no/exhibition/5d9ad83f-73e4-4d8b-8a52-480e2ed76c0d>
+ # || ?uri != <http://data.ub.uib.no/exhibition/d36981f7-0d93-4dda-a5be-8d3b104c4958>
+ # || ?uri != <http://data.ub.uib.no/exhibition/0e8aa8a9-a166-4cbb-b798-d210e18a506e>
+ # || ?uri != <http://data.ub.uib.no/exhibition/e76d5c62-7b20-42c6-aa13-3fc7a243bdb5>
+ # || ?uri != <http://data.ub.uib.no/exhibition/60b37d65-a276-4dfd-8e4a-c79a658ddfa3>
+ # || ?uri != <http://data.ub.uib.no/exhibition/a16ee11e-2991-42eb-b151-2ee84daf1dda>
+ # || ?uri != <http://data.ub.uib.no/exhibition/7da10f07-06ff-40ec-ba8f-fabf458bfa40>
+ # || ?uri != <http://data.ub.uib.no/exhibition/5ed032a5-f361-4975-8663-5c00742a5f82>
+ # || ?uri != <http://data.ub.uib.no/exhibition/31e3fe62-060d-462e-8310-b296eff383c3>
+ # || ?uri != <http://data.ub.uib.no/exhibition/7a84b875-adc2-4587-a82e-1eb76a9e9085>
+ # || ?uri != <http://data.ub.uib.no/exhibition/27f422ed-c2fe-41f0-babd-8b8d03ad1f43>
+ # || ?uri != <http://data.ub.uib.no/exhibition/6fa3df2f-7333-492b-8478-87cd05c176d9>
+ # || ?uri != <http://data.ub.uib.no/exhibition/5ae7b03a-ffaa-4d4c-ad80-8d1df07b4ade>
+ # || ?uri != <http://data.ub.uib.no/exhibition/9d0fa899-c984-43f8-b70a-05d688e4d1ed>
+ # || ?uri != <http://data.ub.uib.no/exhibition/0d56a8bd-e636-4648-bbac-b892e634185a>
+ # || ?uri != <http://data.ub.uib.no/exhibition/6bfc3b67-4342-49ee-b89c-b88553d41549>
+ # || ?uri != <http://data.ub.uib.no/exhibition/b1cb5f34-e35f-40f6-9da1-3a6dfed40648>
+ # || ?uri != <http://data.ub.uib.no/exhibition/efad7c50-a65a-47c3-9324-2642c47b8251>
+ # || ?uri != <http://data.ub.uib.no/exhibition/9ecd4afe-b648-4d5b-b77a-acad40955e5d>
+ # || ?uri != <http://data.ub.uib.no/exhibition/eb6bdee1-73a4-4c2e-b22b-b6b320694a6e>
+ # || ?uri != <http://data.ub.uib.no/exhibition/437ffaed-9bb7-40d9-b91e-58ac6266ee4b>
+ # || ?uri != <http://data.ub.uib.no/exhibition/9d008e6f-5f48-4e66-9909-7340879b67f0>
+ # || ?uri != <http://data.ub.uib.no/exhibition/b807a8ab-9f93-4aad-89c6-d1931d948a26>
+ # || ?uri != <http://data.ub.uib.no/exhibition/bc91e78d-eef6-4833-8831-c63c066c7268>
+ # || ?uri != <http://data.ub.uib.no/exhibition/cd1ecf10-6ec5-449a-8b57-c39b6e29f009>
+ # || ?uri != <http://data.ub.uib.no/exhibition/e0511132-e340-4c1f-a5aa-31168be22be5>
+ # || ?uri != <http://data.ub.uib.no/exhibition/93fc33e4-c79c-42a1-b7c9-6397c891be85>
+ # || ?uri != <http://data.ub.uib.no/exhibition/6e88e615-8687-47bc-bf3f-5ec8fd349bb9>
+ # || ?uri != <http://data.ub.uib.no/exhibition/18eed87e-97dc-4d39-8c64-0bedc3c7d900>
+ # || ?uri != <http://data.ub.uib.no/exhibition/4b930453-0767-4fd1-8194-618baec0ad85>
+ # || ?uri != <http://data.ub.uib.no/exhibition/4adc0168-761d-4b4e-b4ab-56915178f134>
+ # || ?uri != <http://data.ub.uib.no/exhibition/1d13e69a-6cf8-4f7b-a67a-2b11cfc82a53>
+ # || ?uri != <http://data.ub.uib.no/exhibition/79b00f5c-d123-4ddf-b399-6178c7d1a714>
+ # || ?uri != <http://data.ub.uib.no/exhibition/e58aabd5-1c3b-4828-b16d-2647dc9544fa>
+ # || ?uri != <http://data.ub.uib.no/exhibition/2bed9e9b-5504-495b-8a01-f889fe1dfd23>
+ # || ?uri != <http://data.ub.uib.no/exhibition/d4de00eb-7e90-463b-ad87-cc1c2c0fbb73>
+ # || ?uri != <http://data.ub.uib.no/exhibition/006b9d7c-a596-4cfc-a412-dd109cc21052>
+ # || ?uri != <http://data.ub.uib.no/exhibition/5d9f5e88-6668-4d63-b8d5-2aeced191daf>
+ # || ?uri != <http://data.ub.uib.no/exhibition/7517f821-5911-4541-a64b-ff2dad2087b5>
+ # || ?uri != <http://data.ub.uib.no/exhibition/5613c710-b9e4-4da8-ae8e-53d3181064e5>
+ # || ?uri != <http://data.ub.uib.no/exhibition/d08b6009-a51c-44e8-a294-156e3d72a9ba>
+ # || ?uri != <http://data.ub.uib.no/exhibition/09726e98-5806-404b-82a0-815c056f457c>
+ # || ?uri != <http://data.ub.uib.no/exhibition/3743f2ec-20e4-402a-bc85-6b6f8f701b79>
+ # || ?uri != <http://data.ub.uib.no/exhibition/27e294b4-a51e-483a-9369-a56ac2e11ef1>
+ # || ?uri != <http://data.ub.uib.no/exhibition/f0e0291f-ff11-4b18-8dc2-392c2121b2ac>
+ # || ?uri != <http://data.ub.uib.no/exhibition/b3c24277-6a36-4224-887e-63bf35b2663f>
+ )
}
}
ORDER BY ?seq ?title
\ No newline at end of file
diff --git a/components/services/home/html.template b/components/services/home/html.template
index 9043b32e64da6cf508d77e72c39cda139c634008..d9882261cab70b429fd2ed1aaa7a4aeb2e1c2ffa 100644
--- a/components/services/home/html.template
+++ b/components/services/home/html.template
@@ -213,6 +213,8 @@
<div class="row">
<div style="width: 80%; margin: auto; margin-bottom: 70px; margin-top: 30px;">
+ <!-- <div class="alert alert-warning"><p><i class="fa fa-warning"></i> Siste frist for bestilling av bilder fra Billedsamlingen før sommeren er 19. juni.</p></div>
+-->
<!--<div class="alert alert-danger" role="alert"><strong>Søket er utilgjengelig.</strong> Marcus har tekniske problemer og vi jobber med å fikse de. Søket er forhåpentligvis snart tilbake!</div>-->
<form style="width: 100%; margin: auto; border-bottom: 1px dotted #666" role="search" method="get" action="/search">
@@ -395,12 +397,8 @@
</div>-->
<div class="col-md-12">
- <h4>Flere utstillinger</h4>
- <ul class="list-inline">
- {% for row in models.exhibitions %}
- <li style="margin: 5px;"><a href="{{row.uri.value}}"><strong>{{row.label.value}}</strong></a></li>
- {% endfor %}
- </ul>
+ <h4><a href="/exhibitions">Flere utstillinger</a></h4>
+
</div>
</div>
<br>
diff --git a/components/services/home/queries/exhibitions.query b/components/services/home/queries/exhibitions.query
deleted file mode 100644
index e058a764f57edc7c6f686150de8c0fb82531c8fe..0000000000000000000000000000000000000000
--- a/components/services/home/queries/exhibitions.query
+++ /dev/null
@@ -1,12 +0,0 @@
-SELECT DISTINCT ?uri ?label WHERE {
-
- GRAPH <urn:x-arq:UnionGraph> {
-
- ?uri a ubbont:Exhibition .
- ?uri dct:title ?label .
- ?uri ubbont:showWeb true .
- }
-
-}
-ORDER BY ASC(?label)
-LIMIT 12
diff --git a/components/services/instance%2Fcataloguecard/html.template b/components/services/instance%2Fcataloguecard/html.template
index f770dfe1874d8eb1024ab62027c85b24cab6fcd0..6c12e097f94b71bfe87e3af9d23b41e38fe6cd23 100755
--- a/components/services/instance%2Fcataloguecard/html.template
+++ b/components/services/instance%2Fcataloguecard/html.template
@@ -31,7 +31,7 @@
<div class="col-md-9">
- <div class="catalogue-card">
+ <div style="margin-top: 50px;" class="catalogue-card">
<h1>{{ first.main.label.value }}</h1>
diff --git a/components/static/cart.html b/components/static/cart.html
index db8b3a8b341c2165a12c4372f430a5e4490bf90e..29da1c3fde82bbff43901dd92425036e5e864ec6 100755
--- a/components/static/cart.html
+++ b/components/static/cart.html
@@ -204,7 +204,7 @@
<div class="form-group">
<label class="col-md-4 control-label" for="c_country"><span class="required-star">*</span> Land</label>
<div class="col-md-6">
- <select id="c_country" name="c_country" class="form-control input-md" required>
+ <select id="c_country" name="c_country" class="form-control input-md" required onchange="showPorto(this)">
<option value="AF">Afghanistan</option>
<option value="AL">Albania</option>
<option value="DZ">Algeria</option>
@@ -488,10 +488,9 @@
<div class="col-md-6">
<select id="c_deliveryOption" name="c_deliveryOption" class="form-control" required="required">
<option value></option>
- <option value="epost">Epost</option>
<option value="hentes">Hentes</option>
<option value="post">Post</option>
- <option value="ftp">FTP</option>
+ <option value="ftp">File transfer (FTP)</option>
</select>
</div>
</div>
@@ -523,9 +522,22 @@
<div class="alert alert-info">
<div id="cartData" class="clearfix">
+ <div id="porto-no" class="col-md-12">
+ <p>
+ <strong>Frakt Norge:</strong><br>
+ NOK 45 kroner (inkl mva)
+ </p>
+ </div>
+ <div id="porto-foreign" class="col-md-12" style="display: none;">
+ <p>
+ <strong>Postage quote outside Norway:</strong><br>
+ We will contact you with a postage quote before processing your order
+ </p>
+ </div>
<div class="col-md-4 text-right">Antall:</div><div class="col-md-8"><span class="simpleCart_quantity"></span></div>
<div class="col-md-4 text-right">Sum:</div><div class="col-md-8"><span class="simpleCart_total"></span></div>
<div class="col-md-4 text-right">Mva:</div><div class="col-md-8"><span class="simpleCart_tax"></span></div>
+
<div class="col-md-4 h2 text-right"><small>Totalt inkl. mva.: </small></div><div class="col-md-8 h2"><span class="simpleCart_grandTotal"></span></div>
</div>
</div>
@@ -549,25 +561,25 @@
<link href="{{lodspk.home}}js/node_modules/parsleyjs/src/parsley.css" rel='stylesheet' type='text/css'>
<script type="text/javascript">
- simpleCart({
- checkout: {
- type: "SendForm",
+ simpleCart({
+ checkout: {
+ type: "SendForm",
method: "POST",
url: "/cart/index.php",
//url: "https://oppdrag.test.uib.no/cart/index.php",
- },
+ },
cartColumns: [
- { view: 'image' , attr:'thumb', label: false} ,
- { attr: "name" , label: "Tittel" } ,
- { attr: "sign" , label: "Signatur" } ,
- { attr: "type" , label: "Type" } ,
- { view: 'link' , label: '' , attr: 'link' , text: 'Mer informasjon om bildet' } ,
- { attr: "price" , label: "Pris", view: 'currency' } ,
- { view: "decrement" , label: false , text: "-" } ,
- { attr: "quantity" , label: "" } ,
- { view: "increment" , label: false , text: "+" } ,
- { attr: "total" , label: "Sub-total", view: 'currency' } ,
- { view: "remove" , text: "Remove" , label: false }
+ { view: 'image' , attr:'thumb', label: false} ,
+ { attr: "name" , label: "Tittel" } ,
+ { attr: "sign" , label: "Signatur" } ,
+ { attr: "type" , label: "Type" } ,
+ { view: 'link' , label: '' , attr: 'link' , text: 'Mer informasjon om bildet' } ,
+ { attr: "price" , label: "Pris", view: 'currency' } ,
+ { view: "decrement" , label: false , text: "-" } ,
+ { attr: "quantity" , label: "" } ,
+ { view: "increment" , label: false , text: "+" } ,
+ { attr: "total" , label: "Sub-total", view: 'currency' } ,
+ { view: "remove" , text: "Remove" , label: false }
],
cartStyle: 'table',
currency: "NOK",
@@ -625,6 +637,17 @@
});
$('#kontrakt').parsley();
+ function showPorto(elem){
+ if(elem.value == 'NO') {
+ document.getElementById('porto-no').style.display = "block";
+ document.getElementById('porto-foreign').style.display = "none";
+ }
+ else {
+ document.getElementById('porto-no').style.display = "none";
+ document.getElementById('porto-foreign').style.display = "block";
+ }
+ }
+
</script>
</div>
</div>
diff --git a/components/types/bibo__Document/queries/digitalresources.query b/components/types/bibo__Document/queries/digitalresources.query
index af6d5af6d7c7fa954385cf98553e9ccafd8d24cf..f5ac28c7d8868439d50b12802c7549da2af88b61 100755
--- a/components/types/bibo__Document/queries/digitalresources.query
+++ b/components/types/bibo__Document/queries/digitalresources.query
@@ -1,15 +1,21 @@
-SELECT DISTINCT ?imgMD ?imgSM WHERE {
+SELECT DISTINCT ?imgMD ?imgSM ?seqnr WHERE {
GRAPH <urn:x-arq:UnionGraph> {
- OPTIONAL { {
- <{{ uri }}> ubbont:hasRepresentation ?x . ?x dct:hasPart/ubbont:hasResource ?img .
+ OPTIONAL {
+ <{{ uri }}> ubbont:hasRepresentation ?x .
+ ?x dct:hasPart ?page .
+ ?page ubbont:hasResource ?img .
+ ?page ubbont:sequenceNr ?seqnr .
?img ubbont:hasMDView ?imgMD.
?img ubbont:hasSMView ?imgSM.
- } }
- OPTIONAL { {
- <{{ uri }}> ubbont:hasRepresentation ?x . ?x dct:hasPart ?img . ?img ubbont:hasMDView ?imgMD.
- ?img ubbont:hasSMView ?imgSM.
- }}
+ }
+ OPTIONAL {
+ <{{ uri }}> ubbont:hasRepresentation ?x .
+ ?x dct:hasPart ?img .
+ ?img ubbont:sequenceNr ?seqnr .
+ ?img ubbont:hasMDView ?imgMD .
+ ?img ubbont:hasSMView ?imgSM .
+ }
}
}
-ORDER BY ?img
+ORDER BY ?seqnr
diff --git a/components/types/ubbont__Album/queries/dzi.query b/components/types/ubbont__Album/queries/dzi.query
index fd69081de6cde83871e123cc5d55bbaadc5d6cfe..dff3ac5c7324195ff94137e8d8141be5b431d134 100755
--- a/components/types/ubbont__Album/queries/dzi.query
+++ b/components/types/ubbont__Album/queries/dzi.query
@@ -1,14 +1,10 @@
SELECT DISTINCT ?dziUri WHERE {
GRAPH <urn:x-arq:UnionGraph> {
- <{{ uri }}> dct:hasPart ?x.
- ?x ubbont:showWeb true .
- ?x ubbont:hasRepresentation ?hasRepresentation .
- ?hasRepresentation dct:hasPart ?part .
- ?part ubbont:hasDZIView ?dziUri0 .
+ <{{ uri }}> dct:hasPart/ubbont:hasRepresentation|ubbont:hasRepresentation ?hasRepresentation .
+ ?hasRepresentation dct:hasPart ?page .
+ ?page ubbont:hasDZIView|ubbont:hasResource/ubbont:hasDZIView ?dziUri0 .
FILTER (regex(STR(?dziUri0), "dzi","i"))
BIND(REPLACE(?dziUri0, "marcus.uib.no","data.ub.uib.no","i") as ?dziUri)
}
}
-ORDER BY ?dziUri
-
-#går nå rett på albumets deler (dct:hasPart) og ikke sider (ubbony:hasPage)
\ No newline at end of file
+ORDER BY ?dziUri
\ No newline at end of file
diff --git a/technique.query b/technique.query
new file mode 100644
index 0000000000000000000000000000000000000000..d80ea8ec398a86100ece2854ef01e318f23db672
--- /dev/null
+++ b/technique.query
@@ -0,0 +1,8 @@
+SELECT DISTINCT ?uri ?label ?description WHERE {
+ GRAPH <urn:x-arq:UnionGraph> {
+ <{{ uri }}> ubbont:technique ?uri .
+ ?uri rdfs:label ?label ;
+ dct:description ?description .
+ FILTER(langMatches(lang(?label), ""))
+}
+}
\ No newline at end of file