]> git.koha-community.org Git - koha.git/log
koha.git
22 years agofixed up the todays issues and previous issues tables so that they are both listed...
finlayt [Fri, 9 Aug 2002 04:03:43 +0000 (04:03 +0000)]
fixed up the todays issues and previous issues tables so that they are both listed in reverse order by issue date.

22 years agofix to pass the catalog maintenance flag along
rangi [Wed, 31 Jul 2002 09:17:34 +0000 (09:17 +0000)]
fix to pass the catalog maintenance flag along

22 years agoadded a   if the volumendesc field is null.
finlayt [Wed, 31 Jul 2002 04:27:57 +0000 (04:27 +0000)]
added a   if the volumendesc field is null.

22 years agoadded the ordernumber information to make the Aquisitions link work.
finlayt [Wed, 31 Jul 2002 03:56:44 +0000 (03:56 +0000)]
added the ordernumber information to make the Aquisitions link work.

22 years agoadded "notforloan" field to the itemtypes table.
finlayt [Wed, 31 Jul 2002 02:34:27 +0000 (02:34 +0000)]
added "notforloan" field to the itemtypes table.

22 years agoChanged the ItemInfo method. if an items "itemlost" field is 2, the 'duedate' is...
finlayt [Wed, 31 Jul 2002 01:50:06 +0000 (01:50 +0000)]
Changed the ItemInfo method. if an items "itemlost" field is 2, the 'duedate' is set to "Very Overdue". If itemlost = 1, duedate is set to "Lost".

22 years agoadded the itemtype code to the printed slip that goes in a reserved book.
finlayt [Fri, 26 Jul 2002 02:27:16 +0000 (02:27 +0000)]
added the itemtype code to the printed slip that goes in a reserved book.

22 years agoadded the book title and author to the reserve messages.
finlayt [Fri, 26 Jul 2002 01:09:55 +0000 (01:09 +0000)]
added the book title and author to the reserve messages.

22 years agoFixxing bugs
finlayt [Fri, 26 Jul 2002 01:08:48 +0000 (01:08 +0000)]
Fixxing bugs

22 years agoremoved some warn statments.
finlayt [Fri, 26 Jul 2002 01:08:13 +0000 (01:08 +0000)]
removed some warn statments.

22 years agotaking out some warn statements....
finlayt [Thu, 25 Jul 2002 21:42:26 +0000 (21:42 +0000)]
taking out some warn statements....

22 years agoChanged FindReserves so that it gets biblioitem data if the reserve has a reserve...
finlayt [Thu, 25 Jul 2002 21:41:10 +0000 (21:41 +0000)]
Changed FindReserves so that it gets biblioitem data if the reserve has a reserve constraint.

22 years agopod documenting the API.
tipaul [Thu, 25 Jul 2002 13:40:31 +0000 (13:40 +0000)]
pod documenting the API.

22 years agosmall script that show in HTML a MARC biblio stored in koha. Very useful for test...
tipaul [Thu, 25 Jul 2002 09:55:51 +0000 (09:55 +0000)]
small script that show in HTML a MARC biblio stored in koha. Very useful for test, and could be a start for MARC management in koha.

22 years agoNow, the acqui.simple system...
tipaul [Wed, 24 Jul 2002 16:24:20 +0000 (16:24 +0000)]
Now, the acqui.simple system...
marcimport.pl has been almost completly rewritten, so LOT OF BUGS TO COME !!! You've been warned. It seems to work, but...

As with my former messages, nothing seems to have been changed... but ...
* marcimport now uses HTML::Template.
* marcimport now uses MARC::Record. that means that when you import a record, the old-DB is populated with the data as in version 1.2, but the MARC-DB part is filled with full MARC::Record.

<IMPORTANT NOTE>
to get correct response times, you MUST add an index on isbn, issn and lccn rows in biblioitem table. Note this should be done in 1.2 too...
</IMPORTANT NOTE>

<IMPORTANT NOTE2>
acqui.simple manage biblio, biblioitems and items tables quite properly. Normal acquisition system manages biblio, biblioitems BUT NOT items. That will be done in the near future...
</IMPORTANT NOTE2>

what's next now ?
* bug tracking, of course... Surely a dozen of dozens...
* LOT of developpments, i'll surely write a mail to koha-devel tomorrow (as it's time for dinner in France, and i plan to play NeverwinterNights after dinner ;-) ...

22 years agoNow, the API...
tipaul [Wed, 24 Jul 2002 16:11:37 +0000 (16:11 +0000)]
Now, the API...
Database.pm and Output.pm are almost not modified (var test...)

Biblio.pm is almost completly rewritten.

WHAT DOES IT ??? ==> END of Hitchcock suspens

1st, it does... nothing...
Every old API should be there. So if MARC-stuff is not done, the behaviour is EXACTLY the same (if there is no added bug, of course). So, if you use normal acquisition, you won't find anything new neither on screen or old-DB tables ...

All old-API functions have been cloned. for example, the "newbiblio" sub, now has become :
* a "newbiblio" sub, with the same parameters. It just call a sub named OLDnewbiblio
* a "OLDnewbiblio" sub, which is a copy/paste of the previous newbiblio sub. Then, when you want to add the MARC-DB stuff, you can modify the newbiblio sub without modifying the OLDnewbiblio one. If we correct a bug in 1.2 in newbiblio, we can do the same in main branch by correcting OLDnewbiblio.
* The MARC stuff is usually done through a sub named MARCxxx where xxx is the same as OLDxxx. For example, newbiblio calls MARCnewbiblio. the MARCxxx subs use a MARC::Record as parameter.
The last thing to solve was to manage biblios through real MARC import : they must populate the old-db, but must populate the MARC-DB too, without loosing information (if we go from MARC::Record to old-data then back to MARC::Record, we loose A LOT OF ROWS). To do this, there are subs beginning by "ALLxxx" : they manage datas with MARC::Record datas. they call OLDxxx sub too (to populate old-DB), but MARCxxx subs too, with a complete MARC::Record ;-)

In Biblio.pm, there are some subs that permits to build a old-style record from a MARC::Record, and the opposite. There is also a sub finding a MARC-bibid from a old-biblionumber and the opposite too.
Note we have decided with steve that a old-biblio <=> a MARC-Biblio.

22 years ago1st scripts for MARC-DB.
tipaul [Wed, 24 Jul 2002 15:52:53 +0000 (15:52 +0000)]
1st scripts for MARC-DB.

WARNING : YOU MUST DO THE FOLLOWING IF YOU EXPECT THE MAIN-BRANCH TO WORK.

* install MARC::Record package, from cpan or sourceforge
* OVERWRITE File.pm and USMARC.pm. The original misses 1 functionnality we absolutly need in koha (reading a MARC from a variable, not from a file). Thanks to Steve, who modified MARC::Record.
* modify your DB by adding marcschema.sql tables
* populate new tables by launching fill_usmarc.pl

Then, it should work...
What works exactly will come in the next commit, in a few minuts (hitchcock suspens...)

22 years agoremoved warn statement
finlayt [Wed, 24 Jul 2002 05:11:07 +0000 (05:11 +0000)]
removed warn statement

22 years agocommented out a warn or two...
finlayt [Wed, 24 Jul 2002 04:00:33 +0000 (04:00 +0000)]
commented out a warn or two...

22 years agoFixed up the Print module. Added a function printslip that takes a string as an argum...
finlayt [Wed, 24 Jul 2002 03:16:21 +0000 (03:16 +0000)]
Fixed up the Print module. Added a function printslip that takes a string as an argument. It is easier to prepare the slip and then call the print function.
in circulation.pl I have moved some javascript out to the circulation-top.inc

22 years agofixed up the reserves. Can view the printed slip before it is printed!
finlayt [Wed, 24 Jul 2002 03:14:04 +0000 (03:14 +0000)]
fixed up the reserves. Can view the printed slip before it is printed!

22 years agofixed bug that kept asigning reserved books to the same person!
finlayt [Wed, 24 Jul 2002 03:01:17 +0000 (03:01 +0000)]
fixed bug that kept asigning reserved books to the same person!

22 years agoFix permissions on /etc/koha.conf on initial install.
tonnesen [Tue, 23 Jul 2002 06:06:42 +0000 (06:06 +0000)]
Fix permissions on /etc/koha.conf on initial install.

22 years agoreactivated the printreserve method that is used to print a slip when a reserved...
finlayt [Tue, 23 Jul 2002 03:32:42 +0000 (03:32 +0000)]
reactivated the printreserve method that is used to print a slip when a reserved book is returned. this is used in /circ/returns.pl

22 years agochanged the behaviour when a reserved book is returned according to the wishes of...
finlayt [Tue, 23 Jul 2002 03:28:36 +0000 (03:28 +0000)]
changed the behaviour when a reserved book is returned according to the wishes of HLT.

22 years agofixed up some little bugs around the big buttons that change between issues, returns...
finlayt [Tue, 23 Jul 2002 01:28:42 +0000 (01:28 +0000)]
fixed up some little bugs around the big buttons that change between issues, returns and transfers

22 years agothese files were old versions that are not currently used.
finlayt [Mon, 22 Jul 2002 22:40:32 +0000 (22:40 +0000)]
these files were old versions that are not currently used.

22 years agoChanges from rel-1-2 branch
tonnesen [Mon, 22 Jul 2002 22:33:03 +0000 (22:33 +0000)]
Changes from rel-1-2 branch

22 years agoMissing bracket
tonnesen [Mon, 22 Jul 2002 20:45:47 +0000 (20:45 +0000)]
Missing bracket

22 years agoMaking sure fix makes it into the main branch as well
rangi [Sat, 20 Jul 2002 22:30:06 +0000 (22:30 +0000)]
Making sure fix makes it into the main branch as well
Fix for bug 69

22 years agochanged the wording of two messages. see http://bugzilla.katipo.co.nz/show_bug.cgi...
finlayt [Fri, 19 Jul 2002 03:33:52 +0000 (03:33 +0000)]
changed the wording of two messages. see http://bugzilla.katipo.co.nz/show_bug.cgi?id=1390

22 years agoSend cookie in header
tonnesen [Thu, 11 Jul 2002 06:40:06 +0000 (06:40 +0000)]
Send cookie in header

22 years agoCleaned up contents of location information
tonnesen [Thu, 11 Jul 2002 05:48:01 +0000 (05:48 +0000)]
Cleaned up contents of location information

22 years agoUpdates to authentications cripts. userpage.pl is the page for authenticated
tonnesen [Thu, 11 Jul 2002 05:46:58 +0000 (05:46 +0000)]
Updates to authentications cripts.  userpage.pl is the page for authenticated
users in the OPAC to set preferences, get personal information, etc.

22 years ago*** empty log message ***
tipaul [Wed, 10 Jul 2002 13:58:43 +0000 (13:58 +0000)]
*** empty log message ***

22 years agoAuth.pm now caches form submissions and resubmits them if a user logs back in
tonnesen [Tue, 9 Jul 2002 05:37:53 +0000 (05:37 +0000)]
Auth.pm now caches form submissions and resubmits them if a user logs back in
after being logged out for inactivity.  Also switched from crypt passwords to
md5 passwords stored in borrowers table.  Used Digest::MD5 module.  I ain't
gonna reinvent _that_ wheel.  :)

22 years agoBug fix from rel-1-2
tonnesen [Tue, 9 Jul 2002 03:07:05 +0000 (03:07 +0000)]
Bug fix from rel-1-2

22 years agoBug fixes from rel-1-2
tonnesen [Mon, 8 Jul 2002 18:34:35 +0000 (18:34 +0000)]
Bug fixes from rel-1-2

22 years agotoo many arguments to mklink
tonnesen [Mon, 8 Jul 2002 16:45:57 +0000 (16:45 +0000)]
too many arguments to mklink

22 years agouse warnings breaks perl 5.005
tonnesen [Mon, 8 Jul 2002 16:45:34 +0000 (16:45 +0000)]
use warnings breaks perl 5.005

22 years agoAdded sessionqueries table and password/userid fields to borrowers table
tonnesen [Mon, 8 Jul 2002 16:20:26 +0000 (16:20 +0000)]
Added sessionqueries table and password/userid fields to borrowers table

22 years agoCookie bug.
tonnesen [Fri, 5 Jul 2002 20:33:23 +0000 (20:33 +0000)]
Cookie bug.

22 years agoAuth.pm now checks the password againts a new field in the borrowers table
tonnesen [Fri, 5 Jul 2002 19:56:35 +0000 (19:56 +0000)]
Auth.pm now checks the password againts a new field in the borrowers table
(password).   There is also a new "userid" field in the borrowers table.  When
a user logs in, the userid will be checked against the userid first and the
cardnumber second, so either method will work.

22 years agoMinor changes to authentication routines.
tonnesen [Fri, 5 Jul 2002 05:03:36 +0000 (05:03 +0000)]
Minor changes to authentication routines.

22 years agoChecks for a basic authentication userid. If found, it skips the cookie stuff.
tonnesen [Thu, 4 Jul 2002 21:22:21 +0000 (21:22 +0000)]
Checks for a basic authentication userid.  If found, it skips the cookie stuff.
Also now supports scripts that do not _require_ authentication, but might
display differently if they get an authenticated userid (might be useful for
opac pages, where pages could be tailored to meet a patron's preferences).

22 years agoAdditions to authentication scheme. Logs to /tmp/sessionlog. Will move this
tonnesen [Thu, 4 Jul 2002 21:09:43 +0000 (21:09 +0000)]
Additions to authentication scheme.  Logs to /tmp/sessionlog.  Will move this
to a db table.

22 years agoMinor changes
tonnesen [Thu, 4 Jul 2002 19:42:48 +0000 (19:42 +0000)]
Minor changes

22 years agoBeginning of authentication api. Applied to shelves.pl for now as a test case.
tonnesen [Thu, 4 Jul 2002 19:21:29 +0000 (19:21 +0000)]
Beginning of authentication api.  Applied to shelves.pl for now as a test case.

22 years agobug fix
tonnesen [Thu, 4 Jul 2002 18:05:36 +0000 (18:05 +0000)]
bug fix

22 years agoMerged changes from rel-1-2. Abstracted table structure changes by alan.
tonnesen [Thu, 4 Jul 2002 16:41:06 +0000 (16:41 +0000)]
Merged changes from rel-1-2.  Abstracted table structure changes by alan.

22 years agoLong is the road to MARC..
tipaul [Thu, 4 Jul 2002 15:53:02 +0000 (15:53 +0000)]
Long is the road to MARC..

Not related to MARC :
* removed HLT- empty link when no basket for a supplier (should be useful to copy this into rel-1-2 i think)
* fixed some "use of uninitialized value"
related to MARC
* changed use Acquisition to use Catalogue, new package for MARC management

For instance, nothing is done to MARC DB, but structure is modified (see Biblio.pm for details), and everything seems to work : it's still possible to use acqui, and it fills old-DB pretty good.

WARNING : if you work on main trunk, please note Acquisition.pm is NO MORE USED in /acqui/ system. Every sub in Acquisition.pm has been moved to Biblio.pm or Catalogue.pm.

22 years agomerging 1.2 and main branches. main branch now uses ethnicity SQL table
tipaul [Thu, 4 Jul 2002 13:53:56 +0000 (13:53 +0000)]
merging 1.2 and main branches. main branch now uses ethnicity SQL table

22 years agomerging 1.2 and main branches
tipaul [Thu, 4 Jul 2002 13:05:52 +0000 (13:05 +0000)]
merging 1.2 and main branches

22 years agoonly 1 change : buttun-add-new instead of button-add-variable.
tipaul [Thu, 4 Jul 2002 12:46:42 +0000 (12:46 +0000)]
only 1 change : buttun-add-new instead of button-add-variable.
Other diffs are due to "explanation" row adding, only in main branch

22 years agobugfix from merging
tipaul [Thu, 4 Jul 2002 12:28:54 +0000 (12:28 +0000)]
bugfix from merging

22 years agomerging 1.2 and main branches
tipaul [Thu, 4 Jul 2002 10:42:31 +0000 (10:42 +0000)]
merging 1.2 and main branches

22 years agomerging 1.2 and main branches
tipaul [Wed, 3 Jul 2002 12:41:01 +0000 (12:41 +0000)]
merging 1.2 and main branches

22 years agoFixed bug in checkvalidisbn()
tonnesen [Wed, 3 Jul 2002 03:18:50 +0000 (03:18 +0000)]
Fixed bug in checkvalidisbn()

22 years agoFixed so datelastseen is updated on the item record for every issue or return
rangi [Tue, 2 Jul 2002 23:31:33 +0000 (23:31 +0000)]
Fixed so datelastseen is updated on the item record for every issue or return

22 years agomerging changes from rel-1-2
tonnesen [Tue, 2 Jul 2002 22:08:50 +0000 (22:08 +0000)]
merging changes from rel-1-2

22 years agoMerging bug fix from rel-1-2
tonnesen [Tue, 2 Jul 2002 21:46:52 +0000 (21:46 +0000)]
Merging bug fix from rel-1-2

22 years agoAdded from rel-1-2 branch
tonnesen [Tue, 2 Jul 2002 21:37:56 +0000 (21:37 +0000)]
Added from rel-1-2 branch

22 years agoMerged over from rel-1-2
tonnesen [Tue, 2 Jul 2002 20:59:11 +0000 (20:59 +0000)]
Merged over from rel-1-2

22 years agoRemoved use warnings; which breaks perl 5.005
tonnesen [Tue, 2 Jul 2002 20:49:44 +0000 (20:49 +0000)]
Removed use warnings; which breaks perl 5.005

22 years agoCopying missing files from rel-1-2 to trunk
tonnesen [Tue, 2 Jul 2002 20:35:17 +0000 (20:35 +0000)]
Copying missing files from rel-1-2 to trunk

22 years agomodule added from rel-1-2 branch
tonnesen [Tue, 2 Jul 2002 20:31:33 +0000 (20:31 +0000)]
module added from rel-1-2 branch

22 years agoMerged SimpleMarc.pm over from rel-1-2
tonnesen [Tue, 2 Jul 2002 20:30:15 +0000 (20:30 +0000)]
Merged SimpleMarc.pm over from rel-1-2

22 years agoMerged in updates from rel-1-2
tonnesen [Tue, 2 Jul 2002 17:48:06 +0000 (17:48 +0000)]
Merged in updates from rel-1-2

22 years agomerging 1.2 and main branches. Only 1 line merged, as all diffs are due to finlay...
tipaul [Tue, 2 Jul 2002 15:59:53 +0000 (15:59 +0000)]
merging 1.2 and main branches. Only 1 line merged, as all diffs are due to finlay's rewritting of this script.

22 years agoMerge from 1.2 and main branches
tipaul [Tue, 2 Jul 2002 15:46:42 +0000 (15:46 +0000)]
Merge from 1.2 and main branches

22 years agoRegex to change the javascript to make cursor start in barcode box
rangi [Fri, 28 Jun 2002 23:43:16 +0000 (23:43 +0000)]
Regex to change the javascript to make cursor start in barcode box

22 years agomerging 1.2 and main branches
tipaul [Fri, 28 Jun 2002 12:53:02 +0000 (12:53 +0000)]
merging 1.2 and main branches

22 years agomerging 1.2 and main branches
tipaul [Fri, 28 Jun 2002 12:19:50 +0000 (12:19 +0000)]
merging 1.2 and main branches

22 years agomerging 1.2 and main. Diffs are due to new features.
tipaul [Fri, 28 Jun 2002 12:07:16 +0000 (12:07 +0000)]
merging 1.2 and main. Diffs are due to new features.

22 years agomerging 1-2 and main.
tipaul [Fri, 28 Jun 2002 08:53:51 +0000 (08:53 +0000)]
merging 1-2 and main.

22 years agoMerged in optional ethnicity fix from rel-1-2
tonnesen [Thu, 27 Jun 2002 21:16:20 +0000 (21:16 +0000)]
Merged in optional ethnicity fix from rel-1-2

22 years agoFixed bug. $sth->execute after $sti->prepare.
tonnesen [Tue, 25 Jun 2002 16:59:27 +0000 (16:59 +0000)]
Fixed bug.  $sth->execute after $sti->prepare.

22 years agofixed a typo
dragon28 [Tue, 25 Jun 2002 11:05:45 +0000 (11:05 +0000)]
fixed a typo

22 years agofixed a typo
dragon28 [Tue, 25 Jun 2002 10:58:07 +0000 (10:58 +0000)]
fixed a typo

22 years agoremoved "use warnings"
tonnesen [Mon, 24 Jun 2002 21:54:44 +0000 (21:54 +0000)]
removed "use warnings"

22 years agoSwitched button-add-member to button-add-new in /admin/ scripts.
tonnesen [Mon, 24 Jun 2002 18:40:56 +0000 (18:40 +0000)]
Switched button-add-member to button-add-new in /admin/ scripts.

22 years agomerging rel-1-2 and main
tipaul [Mon, 24 Jun 2002 15:00:13 +0000 (15:00 +0000)]
merging rel-1-2 and main

22 years agomerging of rel-1-2 and main branch
tipaul [Mon, 24 Jun 2002 14:16:36 +0000 (14:16 +0000)]
merging of rel-1-2 and main branch

22 years agoPerl 5.005 doesn't like the -I after the script name. (This doesn't
tonnesen [Mon, 24 Jun 2002 13:19:40 +0000 (13:19 +0000)]
Perl 5.005 doesn't like the -I after the script name.  (This doesn't
look very functional yet in any case, but thought I'd put it in as a
fix)  :)

22 years agoChecked diff in branchtransfers. datesent and datearrived are given datetime, not...
finlayt [Sun, 23 Jun 2002 22:38:08 +0000 (22:38 +0000)]
Checked diff in branchtransfers. datesent and datearrived are given datetime, not just date

22 years agomerging branches 1.2 and main
tipaul [Fri, 21 Jun 2002 13:15:36 +0000 (13:15 +0000)]
merging branches 1.2 and main

22 years agoMERGE 1.2 and main branches
tipaul [Fri, 21 Jun 2002 08:55:50 +0000 (08:55 +0000)]
MERGE 1.2 and main branches
Still a few diffs i don't understand :

311,320c311,312
<   categoryname text,
<   codedescription text,
<   PRIMARY KEY (categorycode)
< );
<
< # Table structure for table 'branchrelations'
< #
< CREATE TABLE branchrelations (
<   branchcode varchar(4) DEFAULT '' NOT NULL,
<   categorycode varchar(4) DEFAULT '' NOT NULL
---
>   branchcode char(4) DEFAULT '' NOT NULL,
>   branchholding int(11)
344c336
<   datesent datetime DEFAULT '0000-00-00' NOT NULL,
---
>   datesent date DEFAULT '0000-00-00' NOT NULL,
346c338
<   datearrived datetime,
---
>   datearrived date,
553a546
>

22 years ago* Acquisition synchronised with rel-1-2
tipaul [Thu, 20 Jun 2002 21:07:30 +0000 (21:07 +0000)]
* Acquisition synchronised with rel-1-2
* Update of biblio.pm and catalogue.pm that continuates MARC stuff. Lot of explanations at the beginning of Biblio.pm

22 years agoCosmetic change. Merged with rel-1-2
tonnesen [Thu, 20 Jun 2002 20:43:26 +0000 (20:43 +0000)]
Cosmetic change.  Merged with rel-1-2

22 years agoMerged changes from rel-1-2
tonnesen [Thu, 20 Jun 2002 20:41:21 +0000 (20:41 +0000)]
Merged changes from rel-1-2

22 years agoMerged with rel-1-2 copy
tonnesen [Thu, 20 Jun 2002 20:31:01 +0000 (20:31 +0000)]
Merged with rel-1-2 copy

22 years agoMerged changes from rel-1-2 branch version 1.21.2.1, all fixes to warnings
tonnesen [Thu, 20 Jun 2002 20:10:08 +0000 (20:10 +0000)]
Merged changes from rel-1-2 branch version 1.21.2.1, all fixes to warnings

22 years agoMost of these merges are just removing unused parts of the perl modules.
tonnesen [Thu, 20 Jun 2002 18:56:52 +0000 (18:56 +0000)]
Most of these merges are just removing unused parts of the perl modules.

22 years ago47 files to go, 47 files to go, take one down, pass it around...
tonnesen [Thu, 20 Jun 2002 18:17:51 +0000 (18:17 +0000)]
47 files to go, 47 files to go, take one down, pass it around...
46 files to go.

22 years agoAre we getting sick of merging yet? Not me!
tonnesen [Thu, 20 Jun 2002 18:04:45 +0000 (18:04 +0000)]
Are we getting sick of merging yet?  Not me!

22 years agomerges from rel-1-2. Starting to get a little longer now. Being very
tonnesen [Thu, 20 Jun 2002 17:57:11 +0000 (17:57 +0000)]
merges from rel-1-2.   Starting to get a little longer now.  Being very
careful.

22 years agoThird in the series of branch merges. Starting to run out of easy stuff. :)
tonnesen [Thu, 20 Jun 2002 17:45:18 +0000 (17:45 +0000)]
Third in the series of branch merges.  Starting to run out of easy stuff.  :)

22 years agoMore merges in from rel-1-2
tonnesen [Thu, 20 Jun 2002 17:33:07 +0000 (17:33 +0000)]
More merges in from rel-1-2
All of the changes so far have been minor.  I did uncomment delbiblio($biblio)
in delbiblio.pl in the main branch to match delbiblio.pl in rel-1-2

22 years agoMerging rel-1-2 changes into main
tonnesen [Thu, 20 Jun 2002 17:23:09 +0000 (17:23 +0000)]
Merging rel-1-2 changes into main

22 years agotrying to merge rel-1-2 into main branch... test with this script, choosen randomly ;-)
tipaul [Thu, 20 Jun 2002 15:56:51 +0000 (15:56 +0000)]
trying to merge rel-1-2 into main branch... test with this script, choosen randomly ;-)