[Koha-cvs] koha/C4 Format.pm SearchBiblio.pm Stock.pm [rel_3_0]
Antoine Farnault
antoine at koha-fr.org
Fri Oct 13 16:15:32 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/10/13 14:15:32
Removed files:
C4 : Format.pm SearchBiblio.pm Stock.pm
Log message:
Deleting unused module.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Format.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.8&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/C4/SearchBiblio.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Stock.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.8&r2=0
Patches:
Index: Format.pm
===================================================================
RCS file: Format.pm
diff -N Format.pm
--- Format.pm 13 Oct 2002 11:34:59 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,232 +0,0 @@
-package C4::Format;
-
-# $Id: Format.pm,v 1.8 2002/10/13 11:34:59 arensb Exp $
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
-
-use strict;
-require Exporter;
-
-
-use vars qw($VERSION @ISA @EXPORT);
-
-# set the version for version checking
-$VERSION = 0.01;
-
-=head1 NAME
-
-C4::Format - Functions for pretty-printing strings and numbers
-
-=head1 SYNOPSIS
-
- use C4::Format;
-
-=head1 DESCRIPTION
-
-These functions return pretty-printed versions of strings and numbers.
-
-=head1 FUNCTIONS
-
-=over 2
-
-=cut
-
- at ISA = qw(Exporter);
- at EXPORT = qw(&fmtstr &fmtdec);
-
-=item fmtstr
-
- $str = &fmtstr($env, $string, $format);
-
-Returns C<$string>, padded with space to a given length.
-
-C<$format> is either C<Ln> or C<Rn>, where I<n> is a positive integer.
-C<$str> will be either left-padded or right-padded, respectively.
-
-C<&fmtstr> is almost equivalent to
-
- sprintf("%-n.ns", $string);
-
-or
-
- sprintf("%n.ns", $string);
-
-The only difference is that if I<n> is less than the length of
-C<$string>, then C<&fmtstr> will return the last I<n> characters of
-C<$string>, whereas C<sprintf> will return the first I<n> characters.
-
-C<$env> is ignored.
-
-=cut
-#'
-sub fmtstr {
- # format (space pad) a string
- # $fmt is Ln.. or Rn.. where n is the length
- my ($env,$strg,$fmt)=@_;
- my $align = substr($fmt,0,1);
- my $lenst = substr($fmt,1,length($fmt)-1);
- if ($align eq"R" ) {
- $strg = substr((" "x$lenst).$strg,0-$lenst,$lenst);
- } elsif ($align eq "C" ) {
- $strg =
- substr((" "x(($lenst/2)-(length($strg)/2))).$strg.(" "x$lenst),0,$lenst);
- } else {
- $strg = substr($strg.(" "x$lenst),0,$lenst);
- }
- return ($strg);
-}
-
-=item fmtdec
-
- $str = &fmtdec($env, $number, $format)
-
-Returns a pretty-printed version of C<$number>.
-
-C<$format> specifies how to print the number. It is of the form
-
- [$][,]n[m]
-
-where I<n> and I<m> are digits, specifying the number of digits to use
-before and after the decimal, respectively. Thus,
-
- &fmtdec(undef, 123.456, "42")
-
-will return
-
- " 123.45"
-
-If I<n> is smaller than the size of the integer part, only the last
-I<n> digits will be returned. If I<m> is greater than the number of
-digits after the decimal in C<$number>, the result will be
-right-padded with zeros.
-
-If C<$format> has a leading dollar sign, the number is assumed to be a
-monetary amount. C<$str> will have a dollar sign prepended to the
-value.
-
-If C<$format> has a comma after the optional dollar sign, the integer
-part will be split into three-digit groups separated by commas.
-
-C<$env> is effectively ignored.
-
-=cut
-#'
-# FIXME - This is all terribly provincial, not at all
-# internationalized. I'm pretty sure there's already something out
-# there that'll figure out the current locale, look up the local
-# currency symbol (and whether it goes on the left or right), figure
-# out how numbers are grouped (commas, periods, or what? And how many
-# digits per group?), and will print the whole thing prettily.
-# But I can't find it just now. Maybe POSIX::setlocale() or
-# perllocale(1) might help.
-# FIXME - Bug:
-# fmtdec(undef, 12345.6, ',82') prints " 345.60"
-# fmtdec(undef, 12345.6, '$,82') prints ".60"
-sub fmtdec {
- # format a decimal
- # $fmt is [$][,]n[m]
- my ($env,$numb,$fmt)=@_;
-
- # FIXME - Use $fmt =~ /^(\$)?(,)?(\d)(\d)?$/ instead of this mess of
- # substr()s.
-
- # See if there's a leading dollar sign.
- my $curr = substr($fmt,0,1);
- if ($curr eq "\$") {
- $fmt = substr($fmt,1,length($fmt)-1);
- };
- # See if there's a leading comma
- my $comma = substr($fmt,0,1);
- if ($comma eq ",") {
- $fmt = substr($fmt,1,length($fmt)-1);
- };
- # See whether one number was given, or two.
- my $right;
- my $left = substr($fmt,0,1);
- if (length($fmt) == 1) {
- $right = 0;
- } else {
- $right = substr($fmt,1,1);
- }
- # See if $numb is a floating-point number.
- my $fnumb = "";
- my $tempint = "";
- my $tempdec = "";
- # FIXME - Use
- # $numb =~ /(\d+)\.(\d+)/;
- # $tempint = $1 + 0;
- # $tempdec = $2;
- if (index($numb,".") == 0 ){
- $tempint = 0;
- $tempdec = substr($numb,1,length($numb)-1);
- } else {
- if (index($numb,".") > 0) {
- my $decpl = index($numb,".");
- $tempint = substr($numb,0,$decpl);
- $tempdec = substr($numb,$decpl+1,length($numb)-1-$decpl);
- } else {
- $tempint = $numb;
- $tempdec = 0;
- }
- # If a comma was specified, then comma-separate the integer part
- # FIXME - From the Perl Cookbook (ISBN 1-56592-243-3), sec. 2.1.7:
- # sub commify {
- # my $test = reverse $_[0];
- # $text =~ s/(\d\d\d)(?=\d)(?!\d*\.)/$1,/g;
- # return scalar reverse $text;
- # }
- if ($comma eq ",") {
- while (length($tempdec) > 3) {
- $fnumb = ",".substr($tempint,-3,3).$fnumb;
- substr($tempint,-3,3) = "";
- }
- $fnumb = substr($tempint,-3,3).$fnumb;
- } else {
- $fnumb = $tempint;
- }
- }
- # If a dollar sign was specified, prepend a dollar sign and
- # right-justify the number
- if ($curr eq "\$") {
- $fnumb = fmtstr($env,$curr.$fnumb,"R".$left+1);
- } else {
- if ($left==0) {
- $fnumb = "";
- } else {
- $fnumb = fmtstr($env,$fnumb,"R".$left);
- }
- }
- # Right-pad the decimal part to the given number of digits.
- if ($right > 0) {
- $tempdec .= "0"x$right;
- $tempdec = substr($tempdec,0,$right);
- $fnumb .= ".".$tempdec;
- }
- return $fnumb; # FIXME - Shouldn't return a list.
-}
-
-1;
-__END__
-
-=back
-
-=head1 AUTHOR
-
-Koha Developement team <info at koha.org>
-
-=cut
Index: SearchBiblio.pm
===================================================================
RCS file: SearchBiblio.pm
diff -N SearchBiblio.pm
--- SearchBiblio.pm 3 Jun 2005 17:01:53 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,716 +0,0 @@
-package C4::SearchBiblio;
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
-
-use strict;
-require Exporter;
-use DBI;
-use C4::Context;
-use C4::Biblio;
-use C4::Date;
-use Date::Manip;
-
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
-# set the version for version checking
-$VERSION = 0.02;
-
-=head1 NAME
-
-C4::Search - Functions for searching the Koha MARC catalog
-
-=head1 FUNCTIONS
-
-This module provides the searching facilities for the Koha MARC catalog
-
-=cut
-
- at ISA = qw(Exporter);
- at EXPORT = qw(&catalogsearch1 &catalogsearch &findseealso &findsuggestion &getMARCnotes &getMARCsubjects);
-
-=head1 findsuggestion($dbh,$values);
-
-=head2 $dbh is a link to the DB handler.
-
-use C4::Context;
-my $dbh =C4::Context->dbh;
-
-=head2 $values is a word
-
-Searches words with the same soundex, ordered by frequency of use.
-Useful to suggest other searches to the users.
-
-=cut
-
-sub findsuggestion {
- my ($dbh,$values) = @_;
- my $sth = $dbh->prepare("SELECT count( * ) AS total, word FROM marc_word WHERE sndx_word = soundex( ? ) AND word <> ? GROUP BY word ORDER BY total DESC");
- my @results;
- for(my $i = 0 ; $i <= $#{$values} ; $i++) {
- if (length(@$values[$i]) >=5) {
- $sth->execute(@$values[$i],@$values[$i]);
- my $resfound = 1;
- my @resline;
- while ((my ($count,$word) = $sth->fetchrow) and $resfound <=10) {
- push @results, "@$values[$i]|$word|$count";
-# $results{@$values[$i]} = \@resline;
- $resfound++;
- }
- }
- }
- return \@results;
-}
-
-=head1 findseealso($dbh,$fields);
-
-=head2 $dbh is a link to the DB handler.
-
-use C4::Context;
-my $dbh =C4::Context->dbh;
-
-=head2 $fields is a reference to the fields array
-
-This function modify the @$fields array and add related fields to search on.
-
-=cut
-
-sub findseealso {
- my ($dbh, $fields) = @_;
- my $tagslib = MARCgettagslib ($dbh,1);
- for (my $i=0;$i<=$#{$fields};$i++) {
- my ($tag) =substr(@$fields[$i],1,3);
- my ($subfield) =substr(@$fields[$i],4,1);
- @$fields[$i].=','.$tagslib->{$tag}->{$subfield}->{seealso} if ($tagslib->{$tag}->{$subfield}->{seealso});
- }
-}
-
-=head1 my ($count, @results) = catalogsearch($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$sqlstring);
-
-=head2 $dbh is a link to the DB handler.
-
-use C4::Context;
-my $dbh =C4::Context->dbh;
-
-$tags,$and_or, $excluding, $operator, $value are references to array
-
-=head2 $tags
-
-contains the list of tags+subfields (for example : $@tags[0] = '200a')
-A field can be a list of fields : '200f','700a','700b','701a','701b'
-
-Example
-
-=head2 $and_or
-
-contains a list of strings containing and or or. The 1st value is useless.
-
-=head2 $excluding
-
-contains 0 or 1. If 1, then the request is negated.
-
-=head2 $operator
-
-contains contains,=,start,>,>=,<,<= the = and start work on the complete subfield. The contains operator works on every word in the subfield.
-
-examples :
-contains home, search home anywhere.
-= home, search a string being home.
-
-=head2 $value
-
-contains the value to search
-If it contains a * or a %, then the search is partial.
-
-=head2 $offset and $length
-
-returns $length results, beginning at $offset
-
-=head2 $orderby
-
-define the field used to order the request. Any field in the biblio/biblioitem tables can be used. DESC is possible too
-
-(for example title, title DESC,...)
-
-=head2 $sqlstring
-
-optional argument containing an sql string to be used in the 'where' statement. see usage in opac-search.pl.
-
-=head2 RETURNS
-
-returns an array containing hashes. The hash contains all biblio & biblioitems fields and a reference to an item hash. The "item hash contains one line for each callnumber & the number of items related to the callnumber.
-
-=cut
-
-=head2 my $marcnotesarray = &getMARCnotes($dbh,$bibid,$marcflavour);
-
-Returns a reference to an array containing all the notes stored in the MARC database for the given bibid.
-$marcflavour ("MARC21" or "UNIMARC") determines which tags are used for retrieving subjects.
-
-=head2 my $marcsubjctsarray = &getMARCsubjects($dbh,$bibid,$marcflavour);
-
-Returns a reference to an array containing all the subjects stored in the MARC database for the given bibid.
-$marcflavour ("MARC21" or "UNIMARC") determines which tags are used for retrieving subjects.
-
-=cut
-
-sub catalogsearch1 {
- my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring) = @_;
-# warn "==================";
-# warn "
-# db: $dbh,
-# tags_array: @$tags,
-# andor_array: @$and_or,
-# excludes_array: @$excluding,
-# operator_array: @$operator,
-# value_array: @$value,
-# start: $offset,
-# resultsperpage: $length,
-# orderby: $orderby,
-# order: $desc_or_asc,
-# sqlstring: $sqlstring)\n";
-# warn "==================\n";
-
- my @cols = ('biblionumber','author','title','unititle','notes','serial','seriestitle',
- 'copyrightdate','timestamp','abstract','illus','biblioitemnumber','marc',
- 'url','isbn','volumeddesc','classification','publicationyear','pages','number',
- 'itemtype','place','issn','size','dewey','publishercode','lccn','volume',
- 'subclass', 'volumedate','subtitle','bibid','notforloan',);
- # missing 'CN', 'description', 'odd', 'bn', 'norequests', 'totitem',
- my @valarray = @$value;
-# warn "@$value\n";
-# warn "$valarray[0]\n";
- my $sql = "
- SELECT biblio.biblionumber, biblio.author, biblio.title, biblio.unititle,
- biblio.notes, biblio.serial, biblio.seriestitle, biblio.copyrightdate,
- biblio.timestamp, biblio.abstract,
- biblioitems.illus, biblioitems.biblioitemnumber, biblioitems.marc,
- biblioitems.url, biblioitems.isbn, biblioitems.volumeddesc,
- biblioitems.classification, biblioitems.publicationyear,
- biblioitems.pages, biblioitems.number, biblioitems.itemtype,
- biblioitems.place, biblioitems.issn, biblioitems.size,
- biblioitems.dewey, biblioitems.publishercode, biblioitems.lccn,
- biblioitems.volume, biblioitems.subclass, biblioitems.volumedate,
- bibliosubtitle.subtitle,
- marc_biblio.bibid,
- items.notforloan,
- MATCH(biblio.title,biblio.author,biblio.unititle,biblio.seriestitle)
- AGAINST ('$$value[0]' IN BOOLEAN MODE) as Relevance
- FROM biblio
- LEFT JOIN biblioitems ON biblioitems.biblionumber=biblio.biblionumber
- LEFT JOIN bibliosubtitle ON bibliosubtitle.biblionumber=biblio.biblionumber
- LEFT JOIN marc_biblio ON marc_biblio.biblionumber=biblio.biblionumber
- LEFT JOIN items ON items.biblionumber=biblio.biblionumber
- WHERE MATCH(biblio.title,biblio.author,biblio.unititle,biblio.seriestitle)
- AGAINST ('$$value[0]' IN BOOLEAN MODE)
- ORDER BY Relevance DESC;";
- warn "$sql\n";
- my $sth = $dbh->prepare($sql);
- $sth->execute;
- my @biblioArray=();
- my $numBooks=0;
- while (my @vals = $sth->fetchrow) {
- my $numcols = $#vals;
- my %biblioEntryHash=();
- for(my $i=0; $i<$numcols; $i++) {
- $biblioEntryHash{$cols[$i]} = $vals[$i];
- }
- $biblioEntryHash{odd} = ((($numBooks+1) % 2) > 0) ? 1 : "";
- #FIXME
- $biblioEntryHash{notforloan} = "";
- #warn "\$biblioEntryHash{odd} = .$biblioEntryHash{odd}.\n";
- push(@biblioArray,\%biblioEntryHash);
- $numBooks++;
- }
-
-
-# CN: ARRAY(0x89d1540)? branch + location + callnumber + status
-# CDI SL (N8KIM) (2) (if several, group them)
-# description: ?
-# odd: 1 ?
-# bn: 501? biblionumber?
-# norequests: 0?
-# totitem: 1?
-
-# my ($res,$numres) = catalogsearch(@_);
-# my @results = @$res;
-# warn "==================\n";
-# warn "\n\tres: @$res:,\n\tnumres: $numres\n";
-# while ( (my ($key, $value) = each(%{$results[0]})) && (my ($key1, $value1) = each(%{$biblioArray[0]})) ) {
-# warn "\t$key => $value\t$key1 => $value1\n";
-# }
-# warn "a. " . $results[0]->{odd} . "\t" . $biblioArray[0]->{odd}. "\n";
-# warn "b. " . $results[1]->{odd} . "\t" . $biblioArray[1]->{odd}. "\n";
-# warn "==================\n";
- #return ($res,$numres);
- return (\@biblioArray,$numBooks);
-}
-
-sub catalogsearch {
- my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby,$desc_or_asc,$sqlstring) = @_;
- # build the sql request. She will look like :
- # select m1.bibid
- # from marc_subfield_table as m1, marc_subfield_table as m2
- # where m1.bibid=m2.bibid and
- # (m1.subfieldvalue like "Des%" and m2.subfieldvalue like "27%")
-
- # last minute stripping out of stuff
- # doesn't work @$value =~ s/\'/ /;
- # @$value = map { $_ =~ s/\'/ /g } @$value;
-
- # "Normal" statements
- my @normal_tags = ();
- my @normal_and_or = ();
- my @normal_operator = ();
- my @normal_value = ();
- # Extracts the NOT statements from the list of statements
- my @not_tags = ();
- my @not_and_or = ();
- my @not_operator = ();
- my @not_value = ();
- my $any_not = 0;
- $orderby = "biblio.title" unless $orderby;
- $desc_or_asc = "ASC" unless $desc_or_asc;
- #last minute stripping out of ' and ,
-# paul : quoting, it's done a few lines lated.
-# foreach $_ (@$value) {
-# $_=~ s/\'/ /g;
-# $_=~ s/\,/ /g;
-# }
-
-# the item.notforloan contains an integer. Every value <>0 means "book unavailable for loan".
-# but each library can have it's own table of meaning for each value. Get them
-# 1st search if there is a list of authorised values connected to items.notforloan
- my $sth = $dbh->prepare('select authorised_value from marc_subfield_structure where kohafield="items.notforloan"');
- $sth->execute;
- my %notforloanstatus;
- my ($authorised_valuecode) = $sth->fetchrow;
- if ($authorised_valuecode) {
- $sth = $dbh->prepare("select authorised_value,lib from authorised_values where category=?");
- $sth->execute($authorised_valuecode);
- while (my ($authorised_value,$lib) = $sth->fetchrow) {
- $notforloanstatus{$authorised_value} = $lib?$lib:$authorised_value;
- }
- }
- for(my $i = 0 ; $i <= $#{$value} ; $i++)
- {
- # replace * by %
- @$value[$i] =~ s/\*/%/g;
- # remove % at the beginning
- @$value[$i] =~ s/^%//g;
- @$value[$i] =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\}|\/)/ /g if @$operator[$i] eq "contains";
- if(@$excluding[$i]) # NOT statements
- {
- $any_not = 1;
- if(@$operator[$i] eq "contains")
- {
- foreach my $word (split(/ /, @$value[$i])) # if operator is contains, splits the words in separate requests
- {
- # remove the "%" for small word (3 letters. (note : the >4 is due to the % at the end)
-# warn "word : $word";
- $word =~ s/%//g unless length($word)>4;
- unless (C4::Context->stopwords->{uc($word)} or length($word)==1) { #it's NOT a stopword => use it. Otherwise, ignore
- push @not_tags, @$tags[$i];
- push @not_and_or, "or"; # as request is negated, finds "foo" or "bar" if final request is NOT "foo" and "bar"
- push @not_operator, @$operator[$i];
- push @not_value, $word;
- }
- }
- }
- else
- {
- push @not_tags, @$tags[$i];
- push @not_and_or, "or"; # as request is negated, finds "foo" or "bar" if final request is NOT "foo" and "bar"
- push @not_operator, @$operator[$i];
- push @not_value, @$value[$i];
- }
- }
- else # NORMAL statements
- {
- if(@$operator[$i] eq "contains") # if operator is contains, splits the words in separate requests
- {
- foreach my $word (split(/ /, @$value[$i]))
- {
- # remove the "%" for small word (3 letters. (note : the >4 is due to the % at the end)
-# warn "word : $word";
- $word =~ s/%//g unless length($word)>4;
- unless (C4::Context->stopwords->{uc($word)} or length($word)==1) { #it's NOT a stopword => use it. Otherwise, ignore
- push @normal_tags, @$tags[$i];
- push @normal_and_or, "and"; # assumes "foo" and "bar" if "foo bar" is entered
- push @normal_operator, @$operator[$i];
- push @normal_value, $word;
- }
- }
- }
- else
- {
- push @normal_tags, @$tags[$i];
- push @normal_and_or, @$and_or[$i];
- push @normal_operator, @$operator[$i];
- push @normal_value, @$value[$i];
- }
- }
- }
-
- # Finds the basic results without the NOT requests
- my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
- $sql_where1 .=" ". $sqlstring;
- $sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( biblio.timestamp ) <30" if $orderby =~ "biblio.timestamp";
- my $sth;
- if ($sql_where2) {
- $sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc");
- warn "Q2 : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where2 and ($sql_where1) order by $orderby $desc_or_asc term is @$value";
- } else {
- $sth = $dbh->prepare("select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc");
- warn "Q : select distinct m1.bibid from biblio,biblioitems,items,marc_biblio,$sql_tables where biblio.biblionumber=marc_biblio.biblionumber and biblio.biblionumber=biblioitems.biblionumber and m1.bibid=marc_biblio.bibid and $sql_where1 order by $orderby $desc_or_asc";
- }
- $sth->execute();
- my @result = ();
- my $subtitle; # Added by JF for Subtitles
-
- # Processes the NOT if any and there are results
- my ($not_sql_tables, $not_sql_where1, $not_sql_where2);
-
- if( ($sth->rows) && $any_not ) # some results to tune up and some NOT statements
- {
- ($not_sql_tables, $not_sql_where1, $not_sql_where2) = create_request($dbh,\@not_tags, \@not_and_or, \@not_operator, \@not_value);
-
- my @tmpresult;
-
- while (my ($bibid) = $sth->fetchrow) {
- push @tmpresult,$bibid;
- }
- my $sth_not;
- warn "NOT : select distinct m1.bibid from $not_sql_tables where $not_sql_where2 and ($not_sql_where1)";
- if ($not_sql_where2) {
- $sth_not = $dbh->prepare("select distinct m1.bibid from $not_sql_tables where $not_sql_where2 and ($not_sql_where1)");
- } else {
- $sth_not = $dbh->prepare("select distinct m1.bibid from $not_sql_tables where $not_sql_where1");
- }
- $sth_not->execute();
-
- if($sth_not->rows)
- {
- my %not_bibids = ();
- while(my $bibid = $sth_not->fetchrow()) {
- $not_bibids{$bibid} = 1; # populates the hashtable with the bibids matching the NOT statement
- }
-
- foreach my $bibid (@tmpresult)
- {
- if(!$not_bibids{$bibid})
- {
- push @result, $bibid;
- }
- }
- }
- $sth_not->finish();
- }
- else # no NOT statements
- {
- while (my ($bibid) = $sth->fetchrow) {
- push @result,$bibid;
- }
- }
-
- # we have bibid list. Now, loads title and author from [offset] to [offset]+[length]
- my $counter = $offset;
- # HINT : biblionumber as bn is important. The hash is fills biblionumber with items.biblionumber.
- # so if you dont' has an item, you get a not nice empty value.
- $sth = $dbh->prepare("SELECT biblio.biblionumber as bn,biblio.*, biblioitems.*,marc_biblio.bibid,itemtypes.notforloan,itemtypes.description
- FROM biblio, marc_biblio
- LEFT JOIN biblioitems on biblio.biblionumber = biblioitems.biblionumber
- LEFT JOIN itemtypes on itemtypes.itemtype=biblioitems.itemtype
- WHERE biblio.biblionumber = marc_biblio.biblionumber AND bibid = ?");
- my $sth_subtitle = $dbh->prepare("SELECT subtitle FROM bibliosubtitle WHERE biblionumber=?"); # Added BY JF for Subtitles
- my @finalresult = ();
- my @CNresults=();
- my $totalitems=0;
- my $oldline;
- my ($oldbibid, $oldauthor, $oldtitle);
- my $sth_itemCN = $dbh->prepare("select items.* from items where biblionumber=?");
- my $sth_issue = $dbh->prepare("select date_due,returndate from issues where itemnumber=?");
- # parse all biblios between start & end.
- while (($counter <= $#result) && ($counter <= ($offset + $length))) {
- # search & parse all items & note itemcallnumber
- $sth->execute($result[$counter]);
- my $continue=1;
- my $line = $sth->fetchrow_hashref;
- my $biblionumber=$line->{bn};
- # Return subtitles first ADDED BY JF
- $sth_subtitle->execute($biblionumber);
- my $subtitle_here.= $sth_subtitle->fetchrow." ";
- chop $subtitle_here;
- $subtitle = $subtitle_here;
-# warn "Here's the Biblionumber ".$biblionumber;
-# warn "and here's the subtitle: ".$subtitle_here;
-
- # /ADDED BY JF
-
-# $continue=0 unless $line->{bn};
-# my $lastitemnumber;
- $sth_itemCN->execute($biblionumber);
- my @CNresults = ();
- my $notforloan=1; # to see if there is at least 1 item that can be issued
- while (my $item = $sth_itemCN->fetchrow_hashref) {
- # parse the result, putting holdingbranch & itemcallnumber in separate array
- # then all other fields in the main array
-
- # search if item is on loan
- my $date_due;
- $sth_issue->execute($item->{itemnumber});
- while (my $loan = $sth_issue->fetchrow_hashref) {
- if ($loan->{date_due} and !$loan->{returndate}) {
- $date_due = $loan->{date_due};
- }
- }
- # store this item
- my %lineCN;
- $lineCN{holdingbranch} = $item->{holdingbranch};
- $lineCN{itemcallnumber} = $item->{itemcallnumber};
- $lineCN{location} = $item->{location};
- $lineCN{date_due} = format_date($date_due);
- $lineCN{notforloan} = $notforloanstatus{$line->{notforloan}} if ($line->{notforloan}); # setting not forloan if itemtype is not for loan
- $lineCN{notforloan} = $notforloanstatus{$item->{notforloan}} if ($item->{notforloan}); # setting not forloan it this item is not for loan
- $notforloan=0 unless ($item->{notforloan} or $item->{wthdrawn} or $item->{itemlost});
- push @CNresults,\%lineCN;
- $totalitems++;
- }
- # save the biblio in the final array, with item and item issue status
- my %newline;
- %newline = %$line;
- $newline{totitem} = $totalitems;
- # if $totalitems == 0, check if it's being ordered.
- if ($totalitems == 0) {
- my $sth = $dbh->prepare("select count(*) from aqorders where biblionumber=? and datecancellationprinted is NULL");
- $sth->execute($biblionumber);
- my ($ordered) = $sth->fetchrow;
- $newline{onorder} = 1 if $ordered;
- }
- $newline{biblionumber} = $biblionumber;
- $newline{norequests} = 0;
- $newline{norequests} = 1 if ($line->{notforloan}); # itemtype not issuable
- $newline{norequests} = 1 if (!$line->{notforloan} && $notforloan); # itemtype issuable but all items not issuable for instance
- $newline{subtitle} = $subtitle; # put the subtitle in ADDED BY JF
-
- my @CNresults2= @CNresults;
- $newline{CN} = \@CNresults2;
- $newline{'even'} = 1 if $#finalresult % 2 == 0;
- $newline{'odd'} = 1 if $#finalresult % 2 == 1;
- $newline{'timestamp'} = format_date($newline{timestamp});
- @CNresults = ();
- push @finalresult, \%newline;
- $totalitems=0;
- $counter++;
- }
- my $nbresults = $#result+1;
- return (\@finalresult, $nbresults);
-}
-
-# Creates the SQL Request
-
-sub create_request {
- my ($dbh,$tags, $and_or, $operator, $value) = @_;
-
- my $sql_tables; # will contain marc_subfield_table as m1,...
- my $sql_where1; # will contain the "true" where
- my $sql_where2 = "("; # will contain m1.bibid=m2.bibid
- my $nb_active=0; # will contain the number of "active" entries. an entry is active if a value is provided.
- my $nb_table=1; # will contain the number of table. ++ on each entry EXCEPT when an OR is provided.
-
- my $maxloop=8; # the maximum number of words to avoid a too complex search.
- $maxloop = @$value if @$value<$maxloop;
-
- for(my $i=0; $i<=$maxloop;$i++) {
- if (@$value[$i]) {
- $nb_active++;
- if ($nb_active==1) {
- if (@$operator[$i] eq "start") {
- $sql_tables .= "marc_subfield_table as m$nb_table,";
- $sql_where1 .= "(m1.subfieldvalue like ".$dbh->quote("@$value[$i]%");
- if (@$tags[$i]) {
- $sql_where1 .=" and concat(m1.tag,m1.subfieldcode) in (@$tags[$i])";
- }
- $sql_where1.=")";
- } elsif (@$operator[$i] eq "contains") {
- $sql_tables .= "marc_word as m$nb_table,";
- $sql_where1 .= "(m1.word like ".$dbh->quote("@$value[$i]");
- if (@$tags[$i]) {
- $sql_where1 .=" and m1.tagsubfield in (@$tags[$i])";
- }
- $sql_where1.=")";
- } else {
- $sql_tables .= "marc_subfield_table as m$nb_table,";
- $sql_where1 .= "(m1.subfieldvalue @$operator[$i] ".$dbh->quote("@$value[$i]");
- if (@$tags[$i]) {
- $sql_where1 .=" and concat(m1.tag,m1.subfieldcode) in (@$tags[$i])";
- }
- $sql_where1.=")";
- }
- } else {
- if (@$operator[$i] eq "start") {
- $nb_table++;
- $sql_tables .= "marc_subfield_table as m$nb_table,";
- $sql_where1 .= "@$and_or[$i] (m$nb_table.subfieldvalue like ".$dbh->quote("@$value[$i]%");
- if (@$tags[$i]) {
- $sql_where1 .=" and concat(m$nb_table.tag,m$nb_table.subfieldcode) in (@$tags[$i])";
- }
- $sql_where1.=")";
- $sql_where2 .= "m1.bibid=m$nb_table.bibid and ";
- } elsif (@$operator[$i] eq "contains") {
- if (@$and_or[$i] eq 'and') {
- $nb_table++;
- $sql_tables .= "marc_word as m$nb_table,";
- $sql_where1 .= "@$and_or[$i] (m$nb_table.word like ".$dbh->quote("@$value[$i]");
- if (@$tags[$i]) {
- $sql_where1 .=" and m$nb_table.tagsubfield in(@$tags[$i])";
- }
- $sql_where1.=")";
- $sql_where2 .= "m1.bibid=m$nb_table.bibid and ";
- } else {
- $sql_where1 .= "@$and_or[$i] (m$nb_table.word like ".$dbh->quote("@$value[$i]");
- if (@$tags[$i]) {
- $sql_where1 .=" and m$nb_table.tagsubfield in (@$tags[$i])";
- }
- $sql_where1.=")";
- $sql_where2 .= "m1.bibid=m$nb_table.bibid and ";
- }
- } else {
- $nb_table++;
- $sql_tables .= "marc_subfield_table as m$nb_table,";
- $sql_where1 .= "@$and_or[$i] (m$nb_table.subfieldvalue @$operator[$i] ".$dbh->quote(@$value[$i]);
- if (@$tags[$i]) {
- $sql_where1 .=" and concat(m$nb_table.tag,m$nb_table.subfieldcode) in (@$tags[$i])";
- }
- $sql_where2 .= "m1.bibid=m$nb_table.bibid and ";
- $sql_where1.=")";
- }
- }
- }
- }
-
- if($sql_where2 ne "(") # some datas added to sql_where2, processing
- {
- $sql_where2 = substr($sql_where2, 0, (length($sql_where2)-5)); # deletes the trailing ' and '
- $sql_where2 .= ")";
- }
- else # no sql_where2 statement, deleting '('
- {
- $sql_where2 = "";
- }
- chop $sql_tables; # deletes the trailing ','
- return ($sql_tables, $sql_where1, $sql_where2);
-}
-
-sub getMARCnotes {
- my ($dbh, $bibid, $marcflavour) = @_;
- my ($mintag, $maxtag);
- if ($marcflavour eq "MARC21") {
- $mintag = "500";
- $maxtag = "599";
- } else { # assume unimarc if not marc21
- $mintag = "300";
- $maxtag = "399";
- }
-
- my $sth=$dbh->prepare("SELECT subfieldvalue,tag FROM marc_subfield_table WHERE bibid=? AND tag BETWEEN ? AND ? ORDER BY tagorder");
-
- $sth->execute($bibid,$mintag,$maxtag);
-
- my @marcnotes;
- my $note = "";
- my $tag = "";
- my $marcnote;
-
- while (my $data=$sth->fetchrow_arrayref) {
- my $value=$data->[0];
- my $thistag=$data->[1];
- if ($value=~/\.$/) {
- $value=$value . " ";
- }
- if ($thistag ne $tag && $note ne "") {
- $marcnote = {marcnote => $note,};
- push @marcnotes, $marcnote;
- $note=$value;
- $tag=$thistag;
- }
- if ($note ne $value) {
- $note = $note." ".$value;
- }
- }
-
- if ($note) {
- $marcnote = {marcnote => $note};
- push @marcnotes, $marcnote; #load last tag into array
- }
-
- $sth->finish;
- $dbh->disconnect;
-
- my $marcnotesarray=\@marcnotes;
- return $marcnotesarray;
-} # end getMARCnotes
-
-
-sub getMARCsubjects {
- my ($dbh, $bibid, $marcflavour) = @_;
- my ($mintag, $maxtag);
- if ($marcflavour eq "MARC21") {
- $mintag = "600";
- $maxtag = "699";
- } else { # assume unimarc if not marc21
- $mintag = "600";
- $maxtag = "619";
- }
- my $sth=$dbh->prepare("SELECT subfieldvalue,subfieldcode FROM marc_subfield_table WHERE bibid=? AND tag BETWEEN ? AND ? ORDER BY tagorder");
-
- $sth->execute($bibid,$mintag,$maxtag);
-
- my @marcsubjcts;
- my $subjct = "";
- my $subfield = "";
- my $marcsubjct;
-
- while (my $data=$sth->fetchrow_arrayref) {
- my $value = $data->[0];
- my $subfield = $data->[1];
- if ($subfield eq "a" && $value ne $subjct) {
- $marcsubjct = {MARCSUBJCT => $value,};
- push @marcsubjcts, $marcsubjct;
- $subjct = $value;
- }
- }
-
- $sth->finish;
- $dbh->disconnect;
-
- my $marcsubjctsarray=\@marcsubjcts;
- return $marcsubjctsarray;
-} #end getMARCsubjects
-
-END { } # module clean-up code here (global destructor)
-
-1;
-__END__
-
-=back
-
-=head1 AUTHOR
-
-Koha Developement team <info at koha.org>
-
-=cut
Index: Stock.pm
===================================================================
RCS file: Stock.pm
diff -N Stock.pm
--- Stock.pm 15 Dec 2003 10:57:55 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,50 +0,0 @@
-package C4::Stock;
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
-
-use strict;
-require Exporter;
-
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-use C4::Context;
-
-# set the version for version checking
-$VERSION = 0.01;
-
- at ISA = qw(Exporter);
- at EXPORT = qw(&stockreport);
-
-# FIXME - This function is only used in reports.pl, which in turn is
-# never used. This function (and therefore this module) is probably
-# obsolete.
-sub stockreport {
- my $dbh = C4::Context->dbh;
- my @results;
- my $sth=$dbh->prepare("Select count(*) from items where homebranch='C'");
- $sth->execute;
- my $count=$sth->fetchrow_hashref;
- $results[0]->{'value'}="$count->{'count'}\t Levin";
- $sth->finish;
- $sth=$dbh->prepare("Select count(*) from items where homebranch='F'");
- $sth->execute;
- $count=$sth->fetchrow_hashref;
- $results[1]->{'value'}="$count->{'count'}\t Foxton";
- $sth->finish;
- return(@results);
-}
More information about the Koha-cvs
mailing list