Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RUN apk add --no-cache \

COPY --from=composer:2.8 /usr/bin/composer /usr/bin/composer
COPY --from=jsmin /usr/bin/jsmin /usr/bin/jsmin
RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"

WORKDIR /opt/findingaid

Expand Down Expand Up @@ -78,6 +79,7 @@ RUN apk add --no-cache \

COPY --from=jsmin /usr/bin/jsmin /usr/bin/jsmin
COPY --from=prod-builder /composer/vendor /opt/findingaid/vendor
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"

WORKDIR /opt/findingaid

Expand Down
17 changes: 3 additions & 14 deletions app/controllers/findingaid.php
Original file line number Diff line number Diff line change
Expand Up @@ -198,18 +198,7 @@ public function show()
}
}
}
$prod_indicator = implode(DIRECTORY_SEPARATOR, [
ROOT,
'is_prod',
]);
if (file_exists($prod_indicator)) {
$url = 'https://exploreuk.uky.edu/?' .
$search_field . '=' . urlencode($raw_search);
} else {
$url = 'https://uklibbackups.net/?' .
$search_field . '=' . urlencode($raw_search);
}

$url = '/?' . $search_field . '=' . urlencode($raw_search);
}
else {
$data = $model->xpath("//{$link['field']}");
Expand Down Expand Up @@ -283,7 +272,7 @@ public function show()
'collection_id' => $model->id(),
'call_number' => $model->unitid(),
'item_date' => $model->unitdate(),
'item_url' => 'https://exploreuk.uky.edu/catalog/' . $model->id() . '/',
'item_url' => '/catalog/' . $model->id() . '/',
]
);
}
Expand Down Expand Up @@ -391,7 +380,7 @@ public function show()
}
else {
# This is probably a deleted ExploreUK finding aid
header("Location: https://exploreuk.uky.edu");
header("Location: /");
die();
}
}
Expand Down
3 changes: 3 additions & 0 deletions app/models/component_model.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ class ComponentModel extends Model
{
protected $subcomponents = [];
private $basename;
public $config;
public $links;
public $xml;

public function __construct(protected $id, private $component_id)
{
Expand Down
1 change: 1 addition & 0 deletions app/models/findingaid_model.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ class FindingaidModel extends Model
{
public $path = null;
public $exists = false;
public $metadata;

public function __construct(protected $id)
{
Expand Down
Loading