Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
219 commits
Select commit Hold shift + click to select a range
9d31c46
Merge remote-tracking branch 'origin/configurable-online-types' into …
wiredloose Feb 5, 2013
34af208
Fixed empty arrays when ting_entity don't have relations
cableman Feb 22, 2013
f9d2473
Added class button to see online link
magnify Mar 12, 2013
f132402
Changed button class
magnify Mar 12, 2013
9b27beb
Changed blackhold to virtual field
cableman Mar 22, 2013
89d8bd0
Added update function from blackhole to virtual field
cableman Mar 22, 2013
a913f5c
Updated dependecy to virtual_field
cableman Mar 22, 2013
81b4dde
Ensured that ting request is not asked for the same ids more than onc…
cableman Mar 25, 2013
bcfeab7
Load all the objects by stepping the webservice repeatedly.
runephilosof Feb 15, 2013
b9ee8a7
Add a sprinkling of comments
runephilosof Mar 11, 2013
3724df4
Fixed typo in comment
cableman Mar 25, 2013
fb33aa9
Patch: from https://github.com/ding2/ting/pull/7 adding series numbers
cableman Apr 17, 2013
734f97f
Addes seriesdescription to ting.entities and used series description …
Arni Apr 19, 2013
f8f8452
Fixed idention
cableman Apr 19, 2013
1bf88af
Resolved merge conflict
cableman Apr 19, 2013
faef2c8
Only link ting entity title if the entity is available in the datawell
cableman Apr 19, 2013
70525b7
Stream line of make file
cableman Apr 22, 2013
25d54c9
Fixed indention
Arni Apr 30, 2013
67f7536
Merge branch 'release' into development
Arni Apr 30, 2013
afecbbd
Series search made configurable
Arni Apr 30, 2013
1ae0188
Merge branch 'release' into development
Arni Apr 30, 2013
e1afc14
Changed makefile to point to ding2 on github
cableman May 6, 2013
0f37776
Fixed encoding issues for seriestitles
Arni May 15, 2013
d4e680c
Merge branch 'seriestitles' into development
Arni May 15, 2013
c9f7207
Added collectiontype as parameter to Open Search request
Arni May 28, 2013
d98971e
Updated codeing style
cableman Jun 3, 2013
811d664
Renamed hook_anchor_info() to hook_ding_anchor_info()
cableman Jun 3, 2013
1418e8d
Merge branch 'core-pr-3' into release
cableman Jun 3, 2013
5c37c59
Updated makefile to point to ding2tal
cableman Jun 3, 2013
c7bdfdf
Merge branch 'release' into development
cableman Jun 3, 2013
6cb8826
Merge remote-tracking branch 'origin' into release
cableman Jun 4, 2013
547ec1f
Fixed: trying to get non-object property when search is false
cableman Jun 5, 2013
82eec43
Merge branch 'release' into development
cableman Jun 5, 2013
6cf55a6
Merge remote-tracking branch 'origin' into release
cableman Jun 10, 2013
cf09a24
Changed makefile to use development branch
cableman Jun 24, 2013
15a26d6
Fixed ding_entity_id lenght (256 -> 255), so it do not break installa…
cableman Jun 27, 2013
22eb31e
Merge pull request #9 from ding2tal/core-pr-3
kasperg Jul 3, 2013
3a3aa4e
Merge branch 'master' into release
cableman Jul 3, 2013
a81c70a
Updated makefile to point to development branch and ding2tal
cableman Jul 3, 2013
b64bea9
Merge branch 'release' into development
cableman Jul 3, 2013
42f725c
Merge remote-tracking branch 'origin' into release
cableman Jul 3, 2013
a1bf1d1
Resolved merge conflict in getClassification()
Nov 7, 2012
944bd05
Resolved merge conflict in block view
Nov 9, 2012
8b9603b
Corrected relations anchors
cableman Jul 17, 2013
984d181
case 2048 - Cleanup.
Jan 15, 2013
4fa249d
case 2220 - Remove dk5-text beside material availability on materiald…
Feb 20, 2013
89f28b0
Resolved merge conflict in template_preprocess_ting_object()
Apr 5, 2013
b82b315
Case 2616 - Added ISBN to entity.
Apr 18, 2013
836010c
Case 2616 - Code review.
Apr 19, 2013
fa44cea
Stop spamming the dblog, please.
guddo Apr 19, 2013
2cf9b4e
case 2478 - Custom ranking available in dropdown, when custom ranking…
Apr 22, 2013
f639a67
Resolved merge conflict in ting_execute()
Apr 23, 2013
576d546
Case 2607 - Code review.
Apr 25, 2013
8ff3292
case 2758 - Replacing check_plain with htmlspecialchars.
May 13, 2013
679572f
case 2758 - Removed space from function call.
May 13, 2013
bd47154
Resolved merge conflict _ting_anchor_name()
May 31, 2013
cb8a2d3
Resolved merge conflict in _ting_anchor_name()
May 30, 2013
c544fc2
case 2941 - Restoring char "&" when encoded by htmlspecialchars() on …
Jun 21, 2013
4446226
Fixed blocks with information about related materials and removed har…
cableman Jul 18, 2013
1780e8b
Merge remote-tracking branch 'origin' into release
cableman Jul 18, 2013
a51cd40
Merge branch 'availablein' into development
Arni Sep 4, 2013
b345aa1
clean up
Arni Sep 4, 2013
4aabcfc
Added support for collectiontype
Arni Sep 4, 2013
3578fdd
Added reservation expire settings to the reservation admin form
cableman Sep 16, 2013
c3a2f53
Updated coding style in theme.inc
cableman Sep 17, 2013
2ca15a9
Removed encoding of online url
cableman Sep 17, 2013
8f6d985
Updated coding style
cableman Sep 17, 2013
99e7bba
Fixed online url, so it is correct for "filmstriben" and other online…
cableman Sep 18, 2013
05e8250
Added statement to handle doc-book and fulltext
cableman Sep 19, 2013
34cbdc0
Return series description when parseing fails
cableman Sep 19, 2013
0440e8d
Merge remote-tracking branch 'origin' into release
cableman Sep 20, 2013
2028d7f
Ensured that TingObjectController works with php 5.4
cableman Oct 1, 2013
5949456
Updated coding style and missing function comments
cableman Oct 9, 2013
9662761
Removed function to get ting object, as one allready exists
cableman Oct 9, 2013
b4899dd
Added better cache possibilities to the ting_execute_cache function a…
cableman Oct 10, 2013
c776b8c
Added cache table for ting execute cache and drush support to clear t…
cableman Oct 10, 2013
c2f9eb7
Added cron job to ensure that expire cache entries are removed
cableman Oct 10, 2013
d430114
Send smaller requests to avoid breaking opensearch.
runephilosof Oct 23, 2013
5578564
Fixed the ting cache, now with relations
cableman Oct 24, 2013
17bebdc
Fixed relation and caching of the relations in ting cache
cableman Oct 25, 2013
b2f67ab
Merge pull request #5 from odensecentralbibliotek/smaller-requests
cableman Oct 29, 2013
0c99f1c
Merge remote-tracking branch 'origin' into release
cableman Nov 4, 2013
bc4cf70
Updated makefile to point to tag 7.x-1.0-beta2
cableman Nov 4, 2013
5cb1397
Updated coding style
cableman Nov 11, 2013
9396394
Added new property to TingEntity with collection types information
cableman Nov 11, 2013
bda18de
Added new formatter option to ting titles to display type information…
cableman Nov 11, 2013
e430b88
Revert "Added new property to TingEntity with collection types inform…
cableman Nov 11, 2013
24cba0f
Fixed ting title formatter type prefix
cableman Nov 11, 2013
8f95ef6
Fixed caching issues with collections
cableman Nov 18, 2013
a7e8c8f
Corrected get object logic and added comment
cableman Nov 19, 2013
68402f2
Merge remote-tracking branch 'origin' into release
cableman Nov 25, 2013
a80c1bb
Updated makefile to point to tag 7.x-1.0-beta3
cableman Nov 26, 2013
8a86de9
Updated makefile to point to tag 7.x-1.0-beta3
cableman Nov 26, 2013
929bc5a
Updated coding style in tpl
cableman Nov 27, 2013
a61bd49
Update collection type title to match object type title
cableman Nov 28, 2013
c3d0591
Added search overlay to links in object/collection views
cableman Nov 29, 2013
26b7f3c
Added the first update function to convert "ting_object" table into t…
cableman Dec 2, 2013
19b2237
Fixed cache issue with object without relations that is accessed dire…
cableman Dec 2, 2013
bae78ce
Fixed cache issue with object without relations that is accessed dire…
cableman Dec 2, 2013
f9e18db
Merge branch 'development' into datawell-3
cableman Dec 2, 2013
f3c2c9c
Added missing dot to comment
cableman Dec 2, 2013
5f3bfc1
Added update function to convert most of the v2 data well id's to v3
cableman Dec 2, 2013
4609891
Merge branch 'datawell-3' into development
cableman Dec 5, 2013
e3287a3
Added one more date well 3 update function
cableman Dec 5, 2013
35748cc
Moved series setting in to ting_search
cableman Dec 5, 2013
9ab473f
Updated default ting series term to match data well 3
cableman Dec 5, 2013
8713abe
Changed creator search index in links to phrase.creator
cableman Dec 5, 2013
7eba758
Changed the subject search index to dkcclterm.em to match data well 3
cableman Dec 5, 2013
e66a3b2
Updated default reservable sources to "bibliotekskatalog"
cableman Dec 5, 2013
b612643
Fixed errors in update functions to new PIDs
cableman Dec 5, 2013
81d9678
Fixed mapping to new data well 2 PIDs in update functions
cableman Dec 5, 2013
df0a090
Fixed typo in basis PID id
cableman Dec 5, 2013
1ba1603
Ensured that ting cache entries are not null
cableman Dec 6, 2013
999fd7d
Fixed (once more) the PID updates function
cableman Dec 6, 2013
35c687e
Fixed empty replay records from the data well
cableman Dec 6, 2013
3e6b83e
Ensured links with target blank do not display search overlay
cableman Dec 10, 2013
e8928bd
Merge remote-tracking branch 'origin' into release
cableman Dec 12, 2013
2414ba3
Updated makefile to point to tag 7.x-1.0-beta4
cableman Dec 12, 2013
32cb1b1
Updated admin to show opensearch 3.0 in help text
cableman Dec 16, 2013
f2f67c4
Fixed fetch date well type and sources
cableman Dec 16, 2013
fcf412c
Merge remote-tracking branch 'origin' into release
cableman Dec 18, 2013
5519001
Updated makefile to point to tag 7.x-1.0-beta5
cableman Dec 18, 2013
1ab53fd
Fixed online types admin form
cableman Dec 19, 2013
dd6c376
Added e-node to default online types
cableman Dec 19, 2013
3d22988
Fixed online url by using getOnlineUrl() method
cableman Dec 20, 2013
81776d7
Merge remote-tracking branch 'origin' into release
cableman Dec 20, 2013
bf9632e
Updated makefile to point to tag 7.x-1.0-rc1
cableman Dec 20, 2013
99702a2
Set default ting cache expire to larger than zero to ensure that sear…
cableman Jan 8, 2014
2bd1625
Merge remote-tracking branch 'origin' into release
cableman Jan 8, 2014
ef56553
Updated makefile to point to tag 7.x-1.0-rc2
cableman Jan 8, 2014
af9f143
Updated openscan setting field description with new version
cableman Jan 9, 2014
bbbabe2
Merge branch 'development' into release
cableman Jan 9, 2014
40a9c1a
Updated makefile to point to tag 7.x-1.0-rc3
cableman Jan 20, 2014
b0a04a2
Updated makefile to point to ding2 master branches
cableman Feb 3, 2014
edee769
Updated ting series search registry
cableman Feb 28, 2014
82227a1
Added patch to nano soap module to allow extra curl options
cableman Mar 17, 2014
244da4b
Added quotes for phrase.creator to solve () issue
Mar 18, 2014
c7de6fe
Tried to fix default reservation types and sources
cableman Mar 21, 2014
55b4d67
Updated default reservation types
cableman Mar 25, 2014
740eee0
Removed periodikum and tidsskrift from default reservation types
cableman Mar 25, 2014
88126f8
Removed årbog from default reservation types
cableman Mar 25, 2014
5dc7b47
Updated default series register search string
cableman Mar 26, 2014
a68e85d
Fixed default series title value, removed spaces
cableman Apr 10, 2014
35a2701
Fixed series title for "del af" series
cableman Apr 11, 2014
99be2b2
Removed space in default reservalbe types
cableman Apr 11, 2014
7363e14
Updated virtual field to version 1.2
cableman May 6, 2014
afe4761
Simple code clean up
cableman May 15, 2014
aa28a9c
Issue #373 cableman: Fixed loading of relations only when needed
cableman May 15, 2014
cd4e790
Make the DK5 value available.
May 22, 2014
486d516
Updated cache function name
cableman May 28, 2014
567d7f7
Updated cache function name
cableman May 28, 2014
169fe12
Issue #411 by cableman,hurlum: Fixed ting collection cache indexes
cableman Jun 24, 2014
52a4aa5
Issue #396 by cableman: Fixed user defined ranking to use the right i…
cableman Aug 19, 2014
a0152ab
Also show the DK5-Text.
guddo Aug 22, 2014
25ec789
Merge pull request #10 from ding2tal/core-pr-4
kasperg Sep 26, 2014
3d8ded0
Merge branch 'master' into development
cableman Oct 6, 2014
ed4af9c
Updated make file to point to development branch
cableman Oct 6, 2014
ff4d594
Updated make file to point to master branch
cableman Oct 7, 2014
21fd214
Updated makefile to point to master branch not tag
cableman Oct 15, 2014
daead96
Updated makefile to point to development branch not tag
cableman Oct 15, 2014
78324a9
Merge pull request #7 from guddo/development
cableman Oct 20, 2014
50a3ea5
Reviewed: Fixed spell error in function comment
cableman Oct 21, 2014
4f5af09
Issue #622 by Pjohans: cql.anyIndexes does not exist - use term.defau…
pjohans Oct 27, 2014
f16b217
Merge pull request #11 from pjohans/development
cableman Oct 28, 2014
a0c76bb
Merge pull request #11 from ding2tal/core-pr-5
kasperg Nov 19, 2014
4909e6e
Resovled merge conflict with core in makefile
cableman Jan 19, 2015
1a6d3e3
Merge branch 'development' into core-pr-6
cableman Jan 19, 2015
6e40184
Reviewed: Updated makefile to point to ding2 from ding2tal in makefile
cableman Jan 19, 2015
7d530d7
Merge pull request #12 from ding2tal/core-pr-6
kasperg Jan 19, 2015
1ec9644
Issue #467 by JrgenGNielsen: Add quotes around subject terms in searc…
JrgenGNielsen Feb 16, 2015
4f24d51
Issue 827 by Pjohans: take away boostField from parameters - it is no…
pjohans Feb 17, 2015
f2c08d1
Merge pull request #14 from JrgenGNielsen/master
kasperg Feb 19, 2015
51ad558
Merge pull request #15 from pjohans/master
kasperg Feb 23, 2015
5b51d90
Issue 626 by pjohans: update ting_object table to allow multiple NULL…
pjohans Feb 24, 2015
1b09283
Issue626 by Pjohans: update ting_schema for new installations
pjohans Feb 25, 2015
e3b0d43
Merge pull request #16 from pjohans/Issue626
kasperg Feb 25, 2015
81bb862
Add missing newline
kasperg Feb 25, 2015
9ae4717
Issue1113 by Pjohans: Set and use default (best match) sort method fr…
pjohans Mar 24, 2015
1b58149
Issue796 by Pjohans: if ding_provider fails to translate an old pid -…
pjohans Mar 26, 2015
43b1294
Issue 796 by Pjohans: and do it the right way
pjohans Mar 26, 2015
229eae3
Issue 988 by Pjohans: A material can belong to more than one serie
pjohans Mar 27, 2015
8169f03
Merge pull request #1 from ding2/master
JrgenGNielsen Apr 14, 2015
d24ca9d
Issue #257 by JrgenGNielsen: Implement openSuggestion autocomplete, a…
JrgenGNielsen Apr 14, 2015
f379aea
Issue #257 by JrgenGNielsen: Implement openSuggestion autocomplete, a…
JrgenGNielsen Apr 14, 2015
7466bd4
Issue 1113 by pjohans: changes due to codereview
pjohans Apr 21, 2015
4829640
Issue 796 by pjohans: changes due to review
pjohans Apr 21, 2015
866cc72
Issue1113 by pjohans: changes due to review
pjohans Apr 22, 2015
8d0e851
Merge pull request #28 from pjohans/Issue796
kasperg Apr 23, 2015
0da9380
Merge pull request #27 from pjohans/Issue1113
kasperg Apr 23, 2015
ea84e5c
Issue #257 by JrgenGNielsen: openSuggestion autocomplete. No suports …
JrgenGNielsen May 4, 2015
d7a7bae
Merge pull request #30 from JrgenGNielsen/feature/257-opensuggestion
kasperg Jun 11, 2015
79b6d85
Issue #378 by pjohans: allow other modules (ting_infomedia) to alter …
pjohans Jun 17, 2015
f995ce6
Issue #429 by pjohans: Set user message if any
pjohans Jun 18, 2015
4a69c36
Revert "Feature/257 opensuggestion"
kasperg Jun 24, 2015
6feac11
Merge pull request #35 from ding2/revert-30-feature/257-opensuggestion
kasperg Jun 24, 2015
e88961d
Revert "Revert "Feature/257 opensuggestion""
kasperg Jun 24, 2015
1473c87
Issue #28 by JrgenGNielsen: add getURI() and getType() to TingRelation
JrgenGNielsen Jul 7, 2015
831ec42
Merge pull request #36 from ding2/revert-35-revert-30-feature/257-ope…
kasperg Jul 8, 2015
2cdc117
Merge remote branch 'pjohans/Issue429' into feature/429-zero_hit_blan…
JrgenGNielsen Jul 9, 2015
76b2135
Issue #429 by JrgenGNielsen: Start catch statement on a new line.
JrgenGNielsen Jul 9, 2015
90bbd69
Issue #429 by JrgenGNielsen: Remode code from Issue #378.
JrgenGNielsen Jul 9, 2015
db546be
Issue #429 by JrgenGNielsen: Remove extra newline.
JrgenGNielsen Jul 9, 2015
eae1ed5
Issue #429 by JrgenGNielsen: Remove extra newline.
JrgenGNielsen Jul 9, 2015
70f2b0c
Merge pull request #39 from JrgenGNielsen/feature/429-zero_hit_blank_…
kasperg Jul 10, 2015
cf767fd
Issue #378 by JrgenGNielsen: Use ting_online_url as alter hook
JrgenGNielsen Jul 10, 2015
0556304
Support ting_online_url hook for all leading tokens.
kasperg Jul 10, 2015
6f9c4ed
Merge pull request #41 from kasperg/JrgenGNielsen-feature/378-Infomed…
kasperg Jul 10, 2015
425bc57
Merge branch 'master' into feature/28-isPartOfManifestation_link
JrgenGNielsen Aug 21, 2015
da0b81e
Merge pull request #38 from JrgenGNielsen/feature/28-isPartOfManifest…
cableman Sep 7, 2015
584ba35
Issue 1392 by Pjohans: Make a checkbox to activate filtering on libra…
pjohans Sep 16, 2015
edf82cf
Issue 1392 by Pjohans: fix whitespace
pjohans Sep 29, 2015
0f77b34
Issue 1392 by Pjohans: pass ALL requests through TingSearchCqlDoctor
pjohans Oct 1, 2015
61d497e
Issue 1392 by Pjohans: Changes due to review
pjohans Oct 1, 2015
49f40bf
Issue 1392 by Pjohans: Filter on local holdings if needed
pjohans Oct 21, 2015
bc9ee55
Issue 1392 by kasperg: Do not quote query before performing search.
kasperg Oct 22, 2015
6e7a162
Merge pull request #44 from kasperg/pjohans-Issue1392
cableman Oct 22, 2015
8c62984
Issue #1408 by xendk: Only show normal title on collections.
xendk Oct 22, 2015
2ae8235
Merge pull request #29 from pjohans/Issue988
cableman Oct 28, 2015
1896580
Merge pull request #43 from xendk/no-full-title
cableman Nov 13, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions js/ting.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/**
* @file
* Simple script to help display search overlay when links are clicked.
*/
(function($) {
"use strict";

$(document).ready(function() {
$('a.js-search-overlay').live('click', function() {
var link = $(this);
if (link.attr('href').charAt(0) !== '#') {
// Only show overlay for non-local links.
Drupal.TingSearchOverlay();
}
});

// Ensure overlay on collection view links.
$('.ting-collection-wrapper a[href*="/ting/"]').live('click', function() {
if ($(this).not('[target="_blank"]').length) {
Drupal.TingSearchOverlay();
}
});

// Ensure overlay on object view links.
$('.ting-object-wrapper a[href*="/ting/"]').live('click', function() {
if ($(this).not('[target="_blank"]').length) {
Drupal.TingSearchOverlay();
}
});
});
}(jQuery));
22 changes: 17 additions & 5 deletions plugins/content_types/ting_collection.inc
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<?php
/**
* @file
* Panels pane to display a ting collection.
*/

$plugin = array(
'title' => t('Ting collection'),
Expand All @@ -10,22 +14,30 @@ $plugin = array(
'category' => t('Ting'),
);

function ting_ting_collection_content_type_edit_form($form, &$form_state) {
return $form;
}

/**
* Implements hook_ID_content_type_render().
*/
function ting_collection_content_type_render($subtype, $conf, $args, $context) {
$block = new stdClass();
$object = isset($context->data) ? ($context->data) : NULL;
if ($object instanceOf TingCollection) {
if (sizeof($object->entities) < 2) {
if (count($object->entities) < 2) {
drupal_goto('ting/object/' . $object->id);
}

// Add search overlay trigger.
drupal_add_js(drupal_get_path('module', 'ting') . '/js/ting.js');

$block->title = check_plain($object->title);
$block->content = ting_collection_view($object);
}

return $block;
}

/**
* Implements hook_ID_content_type_edit_form().
*/
function ting_ting_collection_content_type_edit_form($form, &$form_state) {
return $form;
}
22 changes: 18 additions & 4 deletions plugins/content_types/ting_object.inc
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<?php
/**
* @file
* Panels pane to display a ting collection.
*/

$plugin = array(
'title' => t('Ting object'),
Expand All @@ -10,17 +14,27 @@ $plugin = array(
'category' => t('Ting'),
);

function ting_ting_object_content_type_edit_form($form, &$form_state) {
return $form;
}

/**
* Implements hook_ID_content_type_render().
*/
function ting_object_content_type_render($subtype, $conf, $args, $context) {
$block = new stdClass();
$object = isset($context->data) ? ($context->data) : NULL;
if ($object instanceOf TingEntity) {
$block->title = check_plain($object->title);
$block->content = ting_object_view($object);

// Add search overlay trigger.
drupal_add_js(drupal_get_path('module', 'ting') . '/js/ting.js');
}

return $block;
}

/**
* Implements hook_ID_content_type_edit_form().
*/
function ting_ting_object_content_type_edit_form($form, &$form_state) {
return $form;
}

Loading