@@ -, +, @@
up database schema change, add to kohastructure.sql - Update schema files -
Remove javascript debugger call
---
Koha/Report.pm | 25 +++++++++--------
Koha/Schema/Result/SavedSql.pm | 7 +++++
Koha/Schema/Result/Subscription.pm | 7 +++++
Koha/SharedContent.pm | 32 ++++++++++++++++++++++
Koha/Subscription.pm | 11 +++++++-
Koha/Subscription/Numberpatterns.pm | 2 +-
.../mana_01-add_mana_id_in_subscription.sql | 4 +--
installer/data/mysql/kohastructure.sql | 2 ++
.../en/modules/admin/preferences/web_services.pref | 2 +-
serials/serials-collection.pl | 2 +-
t/db_dependent/Serials.t | 2 +-
11 files changed, 78 insertions(+), 18 deletions(-)
--- a/Koha/Report.pm
+++ a/Koha/Report.pm
@@ -42,7 +42,7 @@ Return search info
=cut
sub get_search_info {
- my $self=shift;
+ my $self = shift;
my $sub_mana_info = { 'query' => shift };
return $sub_mana_info;
}
@@ -54,15 +54,15 @@ Return properties that can be shared.
=cut
sub get_sharable_info {
- my $self=shift;
- my $shared_report_id=shift;
- my $report = Koha::Reports->find($shared_report_id);
- my $sub_mana_info = {
- 'savedsql' => $report->savedsql,
- 'report_name' => $report->report_name,
- 'notes' => $report->notes,
+ my $self = shift;
+ my $shared_report_id = shift;
+ my $report = Koha::Reports->find($shared_report_id);
+ my $sub_mana_info = {
+ 'savedsql' => $report->savedsql,
+ 'report_name' => $report->report_name,
+ 'notes' => $report->notes,
'report_group' => $report->report_group,
- 'type' => $report->type,
+ 'type' => $report->type,
};
return $sub_mana_info;
}
@@ -73,17 +73,20 @@ Clear a Mana report to be imported in Koha?
=cut
-sub new_from_mana{
+sub new_from_mana {
my $self = shift;
my $data = shift;
+
+ $data->{mana_id} = $data->{id};
+
delete $data->{exportemail};
delete $data->{kohaversion};
delete $data->{creationdate};
delete $data->{lastimport};
- $data->{mana_id} = $data->{id};
delete $data->{id};
delete $data->{nbofusers};
delete $data->{language};
+
Koha::Report->new($data)->store;
}
--- a/Koha/Schema/Result/SavedSql.pm
+++ a/Koha/Schema/Result/SavedSql.pm
@@ -105,6 +105,11 @@ __PACKAGE__->table("saved_sql");
is_nullable: 1
size: 80
+=head2 mana_id
+
+ data_type: 'integer'
+ is_nullable: 1
+
=cut
__PACKAGE__->add_columns(
@@ -148,6 +153,8 @@ __PACKAGE__->add_columns(
{ data_type => "varchar", is_nullable => 1, size => 80 },
"report_subgroup",
{ data_type => "varchar", is_nullable => 1, size => 80 },
+ "mana_id",
+ { data_type => "integer", is_nullable => 1 },
);
=head1 PRIMARY KEY
--- a/Koha/Schema/Result/Subscription.pm
+++ a/Koha/Schema/Result/Subscription.pm
@@ -271,6 +271,11 @@ __PACKAGE__->table("subscription");
is_nullable: 1
size: 10
+=head2 mana_id
+
+ data_type: 'integer'
+ is_nullable: 1
+
=cut
__PACKAGE__->add_columns(
@@ -358,6 +363,8 @@ __PACKAGE__->add_columns(
{ data_type => "varchar", is_nullable => 1, size => 10 },
"previousitemtype",
{ data_type => "varchar", is_nullable => 1, size => 10 },
+ "mana_id",
+ { data_type => "integer", is_nullable => 1 },
);
=head1 PRIMARY KEY
--- a/Koha/SharedContent.pm
+++ a/Koha/SharedContent.pm
@@ -28,6 +28,18 @@ use C4::Context;
our $MANA_IP = C4::Context->config('mana_config');
+=head1 DESCRIPTION
+
+Package for accessing shared content via Mana
+
+=head2 Package Functions
+
+=cut
+
+=head3 manaRequest
+
+=cut
+
sub manaRequest {
my $mana_request = shift;
my $result;
@@ -53,6 +65,10 @@ sub manaRequest {
return $result ;
}
+=head3 manaIncrementRequest
+
+=cut
+
sub manaIncrementRequest {
my $resource = shift;
my $id = shift;
@@ -71,6 +87,10 @@ sub manaIncrementRequest {
return manaRequest($request);
}
+=head3 manaPostRequest
+
+=cut
+
sub manaPostRequest {
my $resource = shift;
my $content = shift;
@@ -84,6 +104,10 @@ sub manaPostRequest {
return manaRequest($request);
}
+=head3 manaShareInfos
+
+=cut
+
sub manaShareInfos{
my ($query, $loggedinuser, $ressourceid, $ressourcetype) = @_;
my $mana_language;
@@ -132,6 +156,10 @@ sub manaShareInfos{
return $result;
}
+=head3 manaGetRequestWithId
+
+=cut
+
sub manaGetRequestWithId {
my $resource = shift;
my $id = shift;
@@ -142,6 +170,10 @@ sub manaGetRequestWithId {
return manaRequest($request);
}
+=head3 manaGetRequest
+
+=cut
+
sub manaGetRequest {
my $resource = shift;
my $parameters = shift;
--- a/Koha/Subscription.pm
+++ a/Koha/Subscription.pm
@@ -111,7 +111,7 @@ sub remove_subscriber {
$subscriber->delete if $subscriber;
}
-=head3 type
+=head3 get_search_info
=cut
@@ -132,6 +132,10 @@ sub get_search_info {
return $sub_mana_info;
}
+=head3 get_sharable_info
+
+=cut
+
sub get_sharable_info {
my $self = shift;
my $shared_sub_id = shift;
@@ -178,6 +182,11 @@ sub get_sharable_info {
return $sub_mana_info;
}
+
+=head3 _type
+
+=cut
+
sub _type {
return 'Subscription';
}
--- a/Koha/Subscription/Numberpatterns.pm
+++ a/Koha/Subscription/Numberpatterns.pm
@@ -32,7 +32,7 @@ Koha::SubscriptionNumberpatterns - Koha SubscriptionNumberpattern object set cla
=cut
-=head3 uniqeLabel
+=head3 uniqueLabel
=cut
--- a/installer/data/mysql/atomicupdate/mana_01-add_mana_id_in_subscription.sql
+++ a/installer/data/mysql/atomicupdate/mana_01-add_mana_id_in_subscription.sql
@@ -1,2 +1,2 @@
-ALTER TABLE subscription ADD mana_id int(11);
-ALTER TABLE saved_sql ADD mana_id int(11);
+ALTER TABLE subscription ADD mana_id int(11) NULL DEFAULT NULL;
+ALTER TABLE saved_sql ADD mana_id int(11) NULL DEFAULT NULL;
--- a/installer/data/mysql/kohastructure.sql
+++ a/installer/data/mysql/kohastructure.sql
@@ -1434,6 +1434,7 @@ CREATE TABLE saved_sql ( -- saved sql reports
report_area varchar(6) default NULL,
report_group varchar(80) default NULL,
report_subgroup varchar(80) default NULL,
+ `mana_id` int(11) NULL DEFAULT NULL,
PRIMARY KEY (`id`),
KEY sql_area_group_idx (report_group, report_subgroup),
KEY boridx (`borrowernumber`)
@@ -2097,6 +2098,7 @@ CREATE TABLE `subscription` ( -- information related to the subscription
`reneweddate` date default NULL, -- date of last renewal for the subscription
`itemtype` VARCHAR( 10 ) NULL,
`previousitemtype` VARCHAR( 10 ) NULL,
+ `mana_id` int(11) NULL DEFAULT NULL,
PRIMARY KEY (`subscriptionid`),
KEY `by_biblionumber` (`biblionumber`),
CONSTRAINT subscription_ibfk_1 FOREIGN KEY (periodicity) REFERENCES subscription_frequencies (id) ON DELETE SET NULL ON UPDATE CASCADE,
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref
@@ -71,7 +71,7 @@ Web services:
- "Security token used to authenticate on mana:"
- pref: ManaToken
class: Text
- -
You need a security token to authenticate on Mana. If this sytem preference is empty, please fill in the following form, you will receive an email to confirm and activate your token.