use List::MoreUtils qw(any);
use C4::Context;
-use C4::Items qw(GetItem ModItem);
+use C4::Items qw(ModItem);
use C4::Circulation qw(GetOpenIssue);
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG @FIELDS);
my @query_values;
my $query = "
- SELECT courses.*
- FROM courses
- LEFT JOIN course_reserves ON course_reserves.course_id = courses.course_id
+ SELECT c.course_id, c.department, c.course_number, c.section, c.course_name, c.term, c.staff_note, c.public_note, c.students_count, c.enabled, c.timestamp
+ FROM courses c
+ LEFT JOIN course_reserves ON course_reserves.course_id = c.course_id
LEFT JOIN course_items ON course_items.ci_id = course_reserves.ci_id
";
$query .= join( ' AND ', @query_keys );
}
- $query .= " GROUP BY courses.course_id ";
+ $query .= " GROUP BY c.course_id, c.department, c.course_number, c.section, c.course_name, c.term, c.staff_note, c.public_note, c.students_count, c.enabled, c.timestamp ";
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare($query);
my (%params) = @_;
warn identify_myself(%params) if $DEBUG;
- my $itemnumber = $params{'itemnumber'};
- my $itype = $params{'itype'};
- my $ccode = $params{'ccode'};
- my $holdingbranch = $params{'holdingbranch'};
- my $location = $params{'location'};
+ my $itemnumber = $params{'itemnumber'};
return unless ($itemnumber);
push( @values, $params{'itemnumber'} );
foreach (@FIELDS) {
- if ( $params{$_} ) {
- push( @fields, "$_ = ?" );
- push( @values, $params{$_} );
- }
+ push( @fields, "$_ = ?" );
+ push( @values, $params{$_} || undef );
}
my $query = "INSERT INTO course_items SET " . join( ',', @fields );
my $ci_id = $params{'ci_id'};
my $course_item = $params{'course_item'};
- my $itype = $params{'itype'};
- my $ccode = $params{'ccode'};
- my $holdingbranch = $params{'holdingbranch'};
- my $location = $params{'location'};
return unless ( $ci_id || $course_item );
unless ($course_item);
$ci_id = $course_item->{'ci_id'} unless ($ci_id);
- ## Revert fields that had an 'original' value, but now don't
- ## Update the item fields to the stored values from course_items
- ## and then set those fields in course_items to NULL
- my @fields_to_revert;
- foreach (@FIELDS) {
- if ( !$params{$_} && $course_item->{$_} ) {
- push( @fields_to_revert, $_ );
- }
- }
- _RevertFields(
- ci_id => $ci_id,
- fields => \@fields_to_revert,
- course_item => $course_item
- ) if (@fields_to_revert);
-
- ## Update fields that still have an original value, but it has changed
- ## This necessitates only changing the current item values, as we still
- ## have the original values stored in course_items
+
my %mod_params;
foreach (@FIELDS) {
- if ( $params{$_}
- && $course_item->{$_}
- && $params{$_} ne $course_item->{$_} ) {
- $mod_params{$_} = $params{$_};
- }
- }
- ModItem( \%mod_params, undef, $course_item->{'itemnumber'} ) if %mod_params;
-
- ## Update fields that didn't have an original value, but now do
- ## We must save the original value in course_items, and also
- ## update the item fields to the new value
- my $item = GetItem( $course_item->{'itemnumber'} );
- my %mod_params_new;
- my %mod_params_old;
- foreach (@FIELDS) {
- if ( $params{$_} && !$course_item->{$_} ) {
- $mod_params_new{$_} = $params{$_};
- $mod_params_old{$_} = $item->{$_};
- }
+ $mod_params{$_} = $params{$_};
}
- _ModStoredFields( 'ci_id' => $params{'ci_id'}, %mod_params_old );
- ModItem( \%mod_params_new, undef, $course_item->{'itemnumber'} ) if %mod_params_new;
+ ModItem( \%mod_params, undef, $course_item->{'itemnumber'} );
}
=head2 _ModStoredFields
my ( @fields_to_update, @values_to_update );
foreach (@FIELDS) {
- if ( $params{$_} ) {
+ if ( defined($params{$_}) ) {
push( @fields_to_update, $_ );
push( @values_to_update, $params{$_} );
}
my (%params) = @_;
warn identify_myself(%params) if $DEBUG;
- my $ci_id = $params{'ci_id'};
- my $course_item = $params{'course_item'};
- my $fields = $params{'fields'};
- my @fields = @$fields;
+ my $ci_id = $params{'ci_id'};
return unless ($ci_id);
- $course_item = GetCourseItem( ci_id => $params{'ci_id'} )
- unless ($course_item);
+ my $course_item = GetCourseItem( ci_id => $params{'ci_id'} );
my $mod_item_params;
- my @fields_to_null;
- foreach my $field (@fields) {
- foreach (@FIELDS) {
- if ( $field eq $_ && $course_item->{$_} ) {
- $mod_item_params->{$_} = $course_item->{$_};
- push( @fields_to_null, $_ );
- }
- }
+ foreach my $field ( @FIELDS ) {
+ $mod_item_params->{$field} = $course_item->{$field};
}
- ModItem( $mod_item_params, undef, $course_item->{'itemnumber'} ) if $mod_item_params && %$mod_item_params;
-
- my $query = "UPDATE course_items SET " . join( ',', map { "$_=NULL" } @fields_to_null ) . " WHERE ci_id = ?";
- C4::Context->dbh->do( $query, undef, $ci_id ) if (@fields_to_null);
+ ModItem( $mod_item_params, undef, $course_item->{'itemnumber'} ) if $mod_item_params && %$mod_item_params;
}
=head2 _SwapAllFields
warn "C4::CourseReserves::_SwapFields( $ci_id )" if $DEBUG;
my $course_item = GetCourseItem( ci_id => $ci_id );
- my $item = GetItem( $course_item->{'itemnumber'} );
+ my $item = Koha::Items->find($course_item->{'itemnumber'});
my %course_item_fields;
my %item_fields;
foreach (@FIELDS) {
- if ( $course_item->{$_} ) {
+ if ( defined( $course_item->{$_} ) ) {
$course_item_fields{$_} = $course_item->{$_};
- $item_fields{$_} = $item->{$_};
+ $item_fields{$_} = $item->$_ || q{};
}
}
return unless ($ci_id);
- _RevertFields( ci_id => $ci_id, fields => \@FIELDS );
+ _RevertFields( ci_id => $ci_id );
my $query = "
DELETE FROM course_items
my $enabled = $params{'enabled'} || '%';
my @params;
- my $query = "SELECT c.* FROM courses c";
-
- $query .= "
+ my $query = "
+ SELECT c.course_id, c.department, c.course_number, c.section, c.course_name, c.term, c.staff_note, c.public_note, c.students_count, c.enabled, c.timestamp
+ FROM courses c
LEFT JOIN course_instructors ci
ON ( c.course_id = ci.course_id )
LEFT JOIN borrowers b
)
AND
c.enabled LIKE ?
- GROUP BY c.course_id
+ GROUP BY c.course_id, c.department, c.course_number, c.section, c.course_name, c.term, c.staff_note, c.public_note, c.students_count, c.enabled, c.timestamp
";
$term //= '';
projects / koha.git / blobdiff