refdb-cvs — All cvs checkins go to this list

[Refdb-cvs] CVS: makestyle Makestyle.pm,1.3,1.4

[David N. <dav...@us...>]

Update of /cvsroot/refdb/makestyle
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28375

Modified Files:
	Makestyle.pm 
Log Message:
Increment version of module.


Index: Makestyle.pm
===================================================================
RCS file: /cvsroot/refdb/makestyle/Makestyle.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -U2 -r1.3 -r1.4
--- Makestyle.pm	19 Sep 2005 13:59:31 -0000	1.3
+++ Makestyle.pm	19 Sep 2005 14:06:17 -0000	1.4
@@ -6,5 +6,5 @@
 use base qw(Exporter);
 
-our $VERSION = '1.00';
+our $VERSION = '1.1';
 
 =head1 NAME

[Refdb-cvs] CVS: makestyle Makestyle.pm,1.2,1.3

[David N. <dav...@us...>]

Update of /cvsroot/refdb/makestyle
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27137

Modified Files:
	Makestyle.pm 
Log Message:
Increment version number of dtd in doctype declaration.


Index: Makestyle.pm
===================================================================
RCS file: /cvsroot/refdb/makestyle/Makestyle.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -U2 -r1.2 -r1.3
--- Makestyle.pm	19 Sep 2005 13:55:14 -0000	1.2
+++ Makestyle.pm	19 Sep 2005 13:59:31 -0000	1.3
@@ -6159,5 +6159,5 @@
 		my @xml = $self->get_root()->generate_full_xml();
 		open FH , "> $filename" or die "Cannot create stylefile: $!";
-		print FH "<?xml version=\"1.0\"?>\n<!DOCTYPE CITESTYLE PUBLIC \n\t\"-//Markus Hoenicka//DTD CiteStyle V1.3//EN\" \n\t\"http://refdb.sourceforge.net/dtd/citestylex-1.3/citestylex.dtd\">\n";
+		print FH "<?xml version=\"1.0\"?>\n<!DOCTYPE CITESTYLE PUBLIC \n\t\"-//Markus Hoenicka//DTD CiteStyle V1.4//EN\" \n\t\"http://refdb.sourceforge.net/dtd/citestylex-1.4/citestylex.dtd\">\n";
 		print FH $xml[1];
 		close FH;

[Refdb-cvs] CVS: makestyle Makestyle.pm,1.1,1.2

[David N. <dav...@us...>]

Update of /cvsroot/refdb/makestyle
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25207

Modified Files:
	Makestyle.pm 
Log Message:
Support version 1.4 of dtd.  URL renamed to LINK with role 0.


Index: Makestyle.pm
===================================================================
RCS file: /cvsroot/refdb/makestyle/Makestyle.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -U2 -r1.1 -r1.2
--- Makestyle.pm	19 Sep 2005 12:01:17 -0000	1.1
+++ Makestyle.pm	19 Sep 2005 13:55:14 -0000	1.2
@@ -449,5 +449,5 @@
 			while ( 1 ) {
 				$value = $self->_input_choice( "Select value:" , $self->get_enumeration() );
-				if ( $value ) { last; }
+				if ( defined( $value ) ) { last; }
 				print "Invalid choice.  Sorry, please try again.\n";
 			}
@@ -549,5 +549,5 @@
 			while ( 1 ) {
 				$value = $self->_input_choice( "Select value: " , $self->get_enumeration() );
-				if ( $value ) { last; }
+				if ( defined( $value ) ) { last; }
 				print "Invalid choice.  Sorry, please try again.\n";
 			}
@@ -745,5 +745,5 @@
 			while ( 1 ) {
 				$value = $self->_input_choice( "Select value: " , sort( $self->get_enumeration() ) );
-				if ( $value ) { last; }
+				if ( defined( $value ) ) { last; }
 				print "Invalid choice.  Sorry, please try again.\n";
 			}
@@ -798,5 +798,60 @@
 			while ( 1 ) {
 				$value = $self->_input_choice( "Select value: " , sort( $self->get_enumeration() ) );
-				if ( $value ) { last; }
+				if ( defined( $value ) ) { last; }
+				print "Invalid choice.  Sorry, please try again.\n";
+			}
+			$_level{$value} = 1;
+			$self->{value} = $value;
+		}
+	}
+
+	sub DESTROY { if ( $_[0]->get_value() ) { $_level{$_[0]->get_value()} = 0 ; } }
+
+	sub select_value { }
+
+	sub get_enumeration {
+		my ( @enum , $key , $value ) = ( () );
+		while ( ( $key , $value ) = each %_level ) {
+			if ( not ( $_level{$key} ) ) { push( @enum , $key ); }
+		}
+		return @enum;
+	}
+
+	sub reset_counter { foreach ( keys %_level ) { $_level{$_} = 0; } }
+
+package Role_Link;
+	use base qw/ _Attribute /;
+
+	our %_level = (
+		"0"  =>  0 ,
+		"1"  =>  0 ,
+		"2"  =>  0 , 
+		"3"  =>  0 ,
+		"4"  =>  0 ,
+	);
+
+	sub new {
+		my $proto = shift;
+		my $class = ref($proto) || $proto;
+		my $self = $class->SUPER::new(@_);
+		$self->set_name       ( "ROLE" );
+		$self->add_enumeration( qw/ 0 1 2 3 4 / );
+		$self->set_default    ( "0" );
+		$self->set_prompt     ( "Determines which link field the enclosing element refers to: 1-4 correspond to L1-L4, 0 corresponds to UR.  Each possible option can be used in only one attribute." );
+		$self->set_summary( 1 );
+		$self->_assign_level();
+		return defined( $self->get_value() ) ? $self : "Error: Maximum number of " . $self->get_name() . " attributes already exist for element LINK.";
+	}
+
+	# Class-specific
+
+	sub _assign_level { 
+		my ( $self , $value ) = ( shift , undef );
+		if ( scalar( $self->get_enumeration() ) != 0 ) {
+			print "Attribute: " . $self->get_name() . "\n";
+			print $self->_display( $self->get_prompt() );
+			while ( 1 ) {
+				$value = $self->_input_choice( "Select value: " , sort( $self->get_enumeration() ) );
+				if ( defined( $value ) ) { last; }
 				print "Invalid choice.  Sorry, please try again.\n";
 			}
@@ -2162,5 +2217,5 @@
 B<model_order>
 
-With I<model_noorder> this data member determines the content model for children elements.  All of the 64 elements (LINK is excluded) fall into one of three content models regarding children elements: 1. No children elements, 2. An ordered list and 3. An unordered list.
+With I<model_noorder> this data member determines the content model for children elements.  All of the 64 elements fall into one of three content models regarding children elements: 1. No children elements, 2. An ordered list and 3. An unordered list.
 
 This data member is C<undef> in cases (1) and (3).
@@ -2181,5 +2236,5 @@
 B<model_noorder>
 
-With I<model_order> this data member determines the content model for children elements.  All of the 64 elements (LINK is excluded) fall into one of three content models regarding children elements: 1. No children elements, 2. An ordered list and 3. An unordered list.
+With I<model_order> this data member determines the content model for children elements.  All of the 64 elements fall into one of three content models regarding children elements: 1. No children elements, 2. An ordered list and 3. An unordered list.
 
 This data member is C<undef> in cases (1) and (2).
@@ -2886,5 +2941,5 @@
 	        while ( 1 ) {
 	            $choice = $self->_input_choice( "Select attribute to add:" , @attributes );
-	            if ( $choice ) { last; }
+	            if ( defined( $choice ) ) { last; }
 	            print "Invalid choice.  Sorry, please try again.\n";
 	        }
@@ -3352,5 +3407,5 @@
 	        while ( 1 ) {
 	            $choice = $self->_input_choice( "Select child element to add:" , @menu );
-	            if ( $choice ) { last; }
+	            if ( defined( $choice ) ) { last; }
 	            print "Invalid choice.  Sorry, please try again.\n";
 	        }
@@ -3437,5 +3492,5 @@
 Can test for success using C<ref> function.
 
-Does not copy attributes.  Attributes requiring user input during creation are not copyable (this includes Type_PubType, Role_UserDef and Role_Misc).
+Does not copy attributes.  Attributes requiring user input during creation are not copyable (this includes Type_PubType, Role_UserDef, Role_Misc and Role_Link).
 
 Does not copy child elements.  For that, use the C<duplicate> method.
@@ -3824,5 +3879,5 @@
 
 	sub reset_all_counters {
-		foreach ( qw/ Role_AuthorList Role_PubDate Role_Title Role_UserDef Role_Misc / ) { 
+		foreach ( qw/ Role_AuthorList Role_PubDate Role_Title Role_UserDef Role_Misc Role_Link  / ) { 
 			$_->reset_counter();
 		}
@@ -4238,5 +4293,5 @@
 		} );
 		$self->set_noorder( { 
-			element_list => [ "RefNumber" , "AuthorList" , "PubDate" , "Title" , "JournalName" , "Volume" , "Issue" , "Pages" , "Publisher" , "PubPlace" , "Serial" , "Address" , "UserDef" , "Misc" , "Notes" , "Abstract" ] ,
+			element_list => [ "RefNumber" , "AuthorList" , "PubDate" , "Title" , "JournalName" , "Volume" , "Issue" , "Pages" , "Publisher" , "PubPlace" , "Serial" , "Address" , "UserDef" , "Misc" , "Notes" , "Abstract" , "Link" ] ,
 	   		separator    => "Separator" ,
 		} );
@@ -5132,4 +5187,34 @@
 	}
 
+package Link;
+	use base qw/ _Model_Order /;
+
+	sub new {
+		my $proto = shift;
+		my $class = ref($proto) || $proto;
+		my $self = $class->SUPER::new(@_);
+		$self->set_name( "LINK" );
+		$self->set_prompt( "Specifies the location of a UR field or a link field [L1 - L4].  Determines how the field's contents are formatted." );
+		$self->set_help( "Specifies the location of a link field [can be any of UR, L1, L2, L3, L4] in the citation reference.  Determines how the field's contents are formatted." );
+		$self->set_display( "name" );
+		$self->set_summary( "name" );
+		$self->set_attributes( {
+			mandatory => [ "Role_Link" ] ,
+			optional  => [ "Style" ] ,
+		} );
+		$self->set_order( [
+			[ "Preceeding" , "?" ] ,
+			[ "Following"  , "?" ] ,
+		] );
+		return $self;
+	}
+
+	# Class methods
+	sub default_copyable { undef; }
+
+	sub _test_attributes_mandatory {  # override to prevent Role_Link dialog
+		return Role_Link->get_enumeration();
+	}
+
 package Separator;
 	use base qw/ _Model_Childless /;
@@ -5718,5 +5803,5 @@
 			"HELP TOPIC: XML\n\nRefDB style files are well-formed XML files which conform to the \"citestylex\" dtd.  While this utility makes generating style files easier than writing them \"by hand\", you should still have some understanding of xml before using it.  This is the briefest of introductions to the topic.  Several concepts are greatly simplified.\n\nXML is the \"eXtensible Markup Language\".  For the purposes of RefDB stylesheets, the central feature of XML is \"elements\".  An element is a unit of information.  It has the following features: a name, opening and closing tags, attributes and content.  Here is an example element:\n\n<ABBREVIATEFIRST DISPLAYAUTHOR=\"255\" MAXAUTHOR=\"256\" STYLE=\"ITALIC\">et al.</ABBREVIATEFIRST>\n\nName:\nThe element's name is ABBREVIATEFIRST.\n\nTags:\nThe element is bounded by opening and closing tags which consist primarily of the element name enclosed in angle brackets.  The opening tag has the form '<ELEMENT>'.  The closing tag has the form '</ELEMENT>' -- note the slash preceding the element name.\n\nAttributes:\nAn element can have associated attributes.  Attributes have names and values.  In the example element above there are three attributes: DISPLAYAUTHOR, MAXAUTHOR and STYLE.  Attributes are placed inside an element's opening tag after the element name.  They are separated by spaces.  Most attributes have a list of possible legal values (an \"enumeration\").  Some can accept any value.\n\nContent:\nAn element's content appears between the opening and closing tags.  There are few restrictions on element content.\n\n\nFinally, a note about DTDs.  In order for XML documents to be useful there must be agreement about the meanings elements and attributes have.  One means of specifying these meanings is a Document Type Definition (DTD).  A DTD is a set of rules about what element names are legal and in what sequence they can occur, what attributes are associated with each element and what attribute values are legal.  The \"citestylex\" DTD determines the structure of RefDB styles.  This DTD is included with the RefDB installation.";
 		$cache->{"3. Styles"} = 
-			"HELP TOPIC: Styles\n\nAs mentioned in help topic <RefDB> \"styles\" provide rules for RefDB to follow when formatting bibliographies and citations.  Each style is defined in an XML document that conforms to the \"citestylex\" DTD (see help topic <XML> for the briefest of introductions to XML).  It will be most advantageous to have some understanding of XML before attempting to use this utility.\n\nEach style file can be divided broadly into four sections.\n\nFIRST SECTION (STYLENAME element)\nThe first section specifies the xml version, the controlling DTD and the style name.  It includes the STYLENAME element.\n\nSECOND SECTION (REFSTYLE and PUBSTYLE elements)\nThe second section contains formatting rules for bibliography references.  The REFSTYLE element includes a number of PUBSTYLE elements.  Each PUBSTYLE element contains a number of subsidiary elements.  Each PUBSTYLE element and its children specify formatting rules for a particular type of publication.  There are 35 possible publication types, including book, journal and electronic citation.  The publication type each PUBTYPE applies to is determined by PUBTYPE's TYPE attribute.\n\nThere are two kinds of elements in each PUBTYPE.  One type specifies a component of the reference, for example, the TITLE element signifies the title of each reference work and the AUTHORLIST signifies the list of authors of a given work.  These elements have a one-to-one correspondence with reference record ris fields.  For example, the VOLUME element corresponds to the ris VL field.  (See help topic <Using this utility> for how to access this information while creating your style.)  Their presence in the PUBTYPE signifies the presence of the associated component in the bibliography reference.  Also, their location in the PUBTYPE signifies the location of the associated component in the bibliography reference.  For example, if you put AUTHORLIST first in a PUBTYPE, then the authors will appear first in the reference.  If you put REFNUMBER first, the reference will begin with a reference number.\n\nSome elements are simple -- VOLUME, for example, has only one attribute and two possible child elements.  Other elements are complex -- AUTHORLIST, for example, has numerous possible child elements with many associated attributes.  See help topic <Using this utility> for notes on the help available while using this utility.\n\nThe second type of element specifies formatting and punctuation.  These elements include FOLLOWING, PRECEDING and SEPARATOR.  FOLLOWING and PRECEDING are associated with parent elements.  They appear in a reference only if their parent element does.  For example, you may specify the VOLUME element with a PRECEDING element containing 'Vol. '.  If a particular reference of that type contains a volume, for example '10', it will appear in the bibliography as 'Vol. 10'.  If a particular reference of that type does not contain a volume, the text 'Vol. ' will not appear in the bibliography reference.  SEPARATOR, on the other hand, is not associated with any parent elements and will always appear in the reference.  It should be used carefully, especially if nearby reference components may be missing from some references.\n\nSome elements can occur an unlimited number of times in each PUBTYPE, for example, PRECEDING, FOLLOWING and even VOLUME and ISSUE.  Others can occur a limited number of times: AUTHORLIST, for example, can occur no more than three times in a publication type, PUBDATE (publication date) no more than twice and TITLE no more than three times.\n\nAlthough there are 35 possible publication types you do not have to create a PUBTYPE for all of them.  As mentioned above, if a publication type contains an element not found in a particular reference, that element (and associated elements) are simply \"dropped\" from the bibliography for that particular reference.  PUBTYPE 'GEN' is the default publication type.  You should create it first and then create PUBTYPES for any publication types whose requirements are not met by the 'GEN' PUBTYPE.  For example, the 'GEN' PUBTYPE can be designed to meet the needs of an edited work -- it could contain two AUTHORLISTs and TITLEs, the first for the primary work and its authors and the second for the collection details and editors.  It will then also serve the needs of books -- the secondary title and author/editor list will simply be left blank.\n\nWarning: Be careful assigning PRECEDING and FOLLOWING child elements to adjacent elements or you may end up with double punctuation in your references.\n\nTHIRD SECTION (CITSTYLE, INTEXTDEF, AUTHORONLY and YEARONLY elements)\nThese elements determine the formatting of in-text citations.  RefDB provides for three types of citations: default (i.e., author-year), author-only and year only.  The formatting of these citation types are handled, respectively, by the INTEXTDEF, AUTHORONLY and YEARONLY elements (and associated attributes and children elements).  These elements follow a similar schema to that outlined for PUBTYPES: some elements specify the presence and order of citation components while other elements (and attributes) determine citation style.\n\nFOURTH SECTION (BIBSTYLE and BIBLIOTITLE elements)\nThe attributes associated with the BIBSTYLE element determine styling that affects the bibliography as a whole.  The BIBLIOTITLE element determines the title of the bibliography/reference list.\n\n\nA final note:\nThe LINK and STYLESET elements are not available for selection using this utility.  Trust me, you won't need them.";
+			"HELP TOPIC: Styles\n\nAs mentioned in help topic <RefDB> \"styles\" provide rules for RefDB to follow when formatting bibliographies and citations.  Each style is defined in an XML document that conforms to the \"citestylex\" DTD (see help topic <XML> for the briefest of introductions to XML).  It will be most advantageous to have some understanding of XML before attempting to use this utility.\n\nEach style file can be divided broadly into four sections.\n\nFIRST SECTION (STYLENAME element)\nThe first section specifies the xml version, the controlling DTD and the style name.  It includes the STYLENAME element.\n\nSECOND SECTION (REFSTYLE and PUBSTYLE elements)\nThe second section contains formatting rules for bibliography references.  The REFSTYLE element includes a number of PUBSTYLE elements.  Each PUBSTYLE element contains a number of subsidiary elements.  Each PUBSTYLE element and its children specify formatting rules for a particular type of publication.  There are 35 possible publication types, including book, journal and electronic citation.  The publication type each PUBTYPE applies to is determined by PUBTYPE's TYPE attribute.\n\nThere are two kinds of elements in each PUBTYPE.  One type specifies a component of the reference, for example, the TITLE element signifies the title of each reference work and the AUTHORLIST signifies the list of authors of a given work.  These elements have a one-to-one correspondence with reference record ris fields.  For example, the VOLUME element corresponds to the ris VL field.  (See help topic <Using this utility> for how to access this information while creating your style.)  Their presence in the PUBTYPE signifies the presence of the associated component in the bibliography reference.  Also, their location in the PUBTYPE signifies the location of the associated component in the bibliography reference.  For example, if you put AUTHORLIST first in a PUBTYPE, then the authors will appear first in the reference.  If you put REFNUMBER first, the reference will begin with a reference number.\n\nSome elements are simple -- VOLUME, for example, has only one attribute and two possible child elements.  Other elements are complex -- AUTHORLIST, for example, has numerous possible child elements with many associated attributes.  See help topic <Using this utility> for notes on the help available while using this utility.\n\nThe second type of element specifies formatting and punctuation.  These elements include FOLLOWING, PRECEDING and SEPARATOR.  FOLLOWING and PRECEDING are associated with parent elements.  They appear in a reference only if their parent element does.  For example, you may specify the VOLUME element with a PRECEDING element containing 'Vol. '.  If a particular reference of that type contains a volume, for example '10', it will appear in the bibliography as 'Vol. 10'.  If a particular reference of that type does not contain a volume, the text 'Vol. ' will not appear in the bibliography reference.  SEPARATOR, on the other hand, is not associated with any parent elements and will always appear in the reference.  It should be used carefully, especially if nearby reference components may be missing from some references.\n\nSome elements can occur an unlimited number of times in each PUBTYPE, for example, PRECEDING, FOLLOWING and even VOLUME and ISSUE.  Others can occur a limited number of times: AUTHORLIST, for example, can occur no more than three times in a publication type, PUBDATE (publication date) no more than twice and TITLE no more than three times.\n\nAlthough there are 35 possible publication types you do not have to create a PUBTYPE for all of them.  As mentioned above, if a publication type contains an element not found in a particular reference, that element (and associated elements) are simply \"dropped\" from the bibliography for that particular reference.  PUBTYPE 'GEN' is the default publication type.  You should create it first and then create PUBTYPES for any publication types whose requirements are not met by the 'GEN' PUBTYPE.  For example, the 'GEN' PUBTYPE can be designed to meet the needs of an edited work -- it could contain two AUTHORLISTs and TITLEs, the first for the primary work and its authors and the second for the collection details and editors.  It will then also serve the needs of books -- the secondary title and author/editor list will simply be left blank.\n\nWarning: Be careful assigning PRECEDING and FOLLOWING child elements to adjacent elements or you may end up with double punctuation in your references.\n\nTHIRD SECTION (CITSTYLE, INTEXTDEF, AUTHORONLY and YEARONLY elements)\nThese elements determine the formatting of in-text citations.  RefDB provides for three types of citations: default (i.e., author-year), author-only and year only.  The formatting of these citation types are handled, respectively, by the INTEXTDEF, AUTHORONLY and YEARONLY elements (and associated attributes and children elements).  These elements follow a similar schema to that outlined for PUBTYPES: some elements specify the presence and order of citation components while other elements (and attributes) determine citation style.\n\nFOURTH SECTION (BIBSTYLE and BIBLIOTITLE elements)\nThe attributes associated with the BIBSTYLE element determine styling that affects the bibliography as a whole.  The BIBLIOTITLE element determines the title of the bibliography/reference list.\n\n\nA final note:\nThe STYLESET element is not available for selection using this utility.  Trust me, you won't need it.";
 		$cache->{"4. Using this utility"} = 
 			"HELP TOPIC: Using this utility\n\nIn short, this utility consists of a loop in which you are asked to:\n\n  - select an element from a list of elements allowed in that part of the style,\n  - enter or select appropriate values for mandatory attributes,\n  - select optional attributes for that element and enter their values,\n  - select an element from a list of elements ...\n\nThis process ends when you have exhausted the DTD (see section <XML>).\n\nEvery time you are presented with a list of elements you have the option of selecting help.  Doing so will present a screen with a summary of each element on the list.  The same thing happens when you are presented with a list of attributes.\n\nWhen an attribute or element is required by the DTD this utility will select it automatically.  For some objects you will not need to provide input and so this utility will create the object(s) automatically.  This can be disconcerting at first.  Please read the console feedback carefully.\n\nWhenever you are asked to enter or select a value for an attribute or element, you are given a brief prompt explaining the purpose of the element or attribute.\n\nAfter each element is added to the style you are presented with a \"progress report\" showing the (major) elements.  It may take a little while to understand this feedback.  As you add elements they will be appended to the report.  When you complete a major element, such as a PUBTYPE or AUTHORLIST, however, its subsidiary elements are no longer displayed -- they are \"folded\".  This saves space and makes it easier to quickly understand where in the style you are at that point in time.  As you become more familiar with the structure of the style DTD this display will become increasingly useful.\n\nAt certain times within PUBTYPE, AUTHORONLY, YEARONLY and INTEXTDEF elements you are able to delete the previous \"major\" element.  \"Major\" elements are those corresponding to ris fields.  These elements may contain other elements.  For example, deleting an AUTHORLIST element will delete all the children elements of that author list style.  You can view the complete element before deletion occurs.\n\nWhen you select some elements (in general, those corresponding to ris fields) you will be given an opportunity to copy the most recently entered element of that type.  If you choose to copy, all attributes and sub-elements will be copied.  This can save you a lot of time if, for example, your author lists will always have the same formatting.\n\nAfter you have created your style this utility will save it to a disk file.  It will also generate a brief summary of it in html format.  This summary can be of great help when entering references in your reference database.\n\nDepending on the version of this utility and the configuration of your system, this utility may offer to upload the style to RefDB.  There is no foreseeable way in which this operation could damage your reference data, but you use it at your own risk...";
@@ -5811,5 +5896,5 @@
 			while ( 1 ) {
 				$choice = $self->_input_choice( "Select help topic:" , @topics );
-				if ( $choice ) { last; }
+				if ( defined( $choice ) ) { last; }
 				print "Invalid choice.  Sorry, please try again.\n";
 			}
@@ -5836,5 +5921,5 @@
 			while ( 1 ) {
 				$choice = $self->_input_choice( "Select help topic:" , @topics );
-				if ( $choice ) { last; }
+				if ( defined( $choice ) ) { last; }
 				print "Invalid choice.  Sorry, please try again.\n";
 			}
@@ -6131,5 +6216,5 @@
 			while ( 1 ) {
 				$choice = $self->_input_choice( "\nHas refdba been configured to know your username and password? ('No' if unsure)" , ( "Yes" , "No" , "Abort" ) );
-				if ( $choice ) { last; }
+				if ( defined( $choice ) ) { last; }
 				print "Invalid choice.  Sorry, please try again.\n";
 			}

[Refdb-cvs] CVS: makestyle refdb-ms.1,NONE,1.1

[David N. <dav...@us...>]

Update of /cvsroot/refdb/makestyle
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv800

Added Files:
	refdb-ms.1 
Log Message:
Add manpage for refdb-ms


--- NEW FILE ---
.\" Hey, EMACS: -*- nroff -*-
.\" 
.\" Filename: refdb-ms.1
.\" Author:   David Nebauer
.\" History:  2005-07-17 - created
.\" 
.\" For header (.TH), first parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" Other parameters are allowed: see man(7), man(1)
.\" Please adjust the date whenever revising the manpage.
.\" 
.\" Some roff macros, for reference:
.\" .nh        disable hyphenation
.\" .hy        enable hyphenation
.\" .ad l      left justify
.\" .ad b      justify to both left and right margins
.\" .nf        disable filling
.\" .fi        enable filling
.\" .br        insert line break
.\" .sp <n>    insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.\" 
.\" Formatting [see groff_char (7) for details]:
.\" \(aq  : escape sequence for (')
.\" ``    : left/open double quote
.\" ''    : right/close double quote
.\" `     : left/open single quote
.\" '     : right/close single quote
.\" \(em  : escape sequence for em dash
.\" \(en  : escape sequence for en dash
.\" \.    : escape sequence for period/dot
.\" \fX   : escape sequence that changes font, where 'X' can be 'R|I|B|BI'
.\"         (R = roman/normal | I = italic | B = bold | BI = bold-italic)
.\" \fP   : switch to previous font
.\"         in this case '\fR' could also have been used
.\" 
.\" Bulleted list:
.\"    A bulleted list:
.\"    .IP \[bu] 2
.\"    lawyers
.\"    .IP \[bu]
.\"    guns
.\"    .IP \[bu]
.\"    money
.\" Numbered list:
.\"    .nr step 1 1
.\"    A numbered list:
.\"    .IP \n[step] 3
.\"    lawyers
.\"    .IP \n+[step]
.\"    guns
.\"    .IP \n+[step]
.\"    money
.TH "REFDB-MS" "1" "2005-07-17" "" "Refdb-ms Manual"
.SH "NAME"
refdb-ms \- a console-based style generator for RefDB
.SH "SYNOPSIS"
\fBrefdb-ms\fR
.SH "DESCRIPTION"
refdb-ms is a console-based style generator for RefDB.
.PP
In short, this utility consists of a loop in which you are asked to:
.IP \[bu] 2
select an element from a list of elements allowed in that part of the style,
.IP \[bu]
enter or select appropriate values for mandatory attributes,
.IP \[bu]
select optional attributes for that element and enter their values,
.IP \[bu]
select an element from a list of elements ...
.PP
This process ends when you have exhausted the DTD.
.PP
Every time you are presented with a list of elements you have the option of selecting help.  Doing so will present a screen with a summary of each element on the list.  The same thing happens when you are presented with a list of attributes.
.PP
When an attribute or element is required by the DTD this utility will select it automatically.  For some objects you will not need to provide input and so this utility will create the object(s) automatically.  This can be disconcerting at first.  Please read the console feedback carefully.
.PP
Whenever you are asked to enter or select a value for an attribute or element, you are given a brief prompt explaining the purpose of the element or attribute.  After each element is added to the style you are presented with a "progress report" showing the (major) elements.  It may take a little while to understand this feedback.  As you add elements they will be appended to the report.  When you complete a major element, such as a PUBTYPE or AUTHORLIST, however, its subsidiary elements are no longer displayed -- they are "folded".  This saves space and makes it easier to quickly understand where in the style you are at that point in time.  As you become more familiar with the structure of the style DTD this display will become increasingly useful.
.PP
At certain times within PUBTYPE, AUTHORONLY, YEARONLY and INTEXTDEF elements you are able to delete the previous "major" element.  "Major" elements are those corresponding to ris fields.  These elements may contain other elements.  For example, deleting an AUTHORLIST element will delete all the children elements of that author list style.  You can view the complete element before deletion occurs.
.PP
When you select some elements (in general, those corresponding to ris fields) you will be given an opportunity to copy the most recently entered element of that type.  If you choose to copy, all attributes and sub-elements will be copied.  This can save you a lot of time if, for example, your author lists will always have the same formatting.
.PP
After you have created your style this utility will save it to a disk file.  It will also generate a brief summary of it in html format.  This summary can be of great help when entering references in your reference database.
.PP
This utility will then offer to upload the style to RefDB.  There is no foreseeable way in which this operation could damage your reference data, but you use it at your own risk.
.SH "FILES"
.I Refdb::Makestyle
.IP 
This module is required by refdb-ms.  It is available as a tar.gz archive or a Debian package from the RefDB website <refdb.sourceforge.net>.
.SH "SEE ALSO"
\fBRefdb::Makestyle\fR (3).
.PP
\fIRefDB manual\fR <http://refdb.sourceforge.net/manual/book1.html>
.SH "AUTHOR"
refdb-ms was written by David Nebauer <da...@ne...>.
.PP 
This manual page was written by David Nebauer <da...@ne...>
for the Debian project (but may be used by others).

[Refdb-cvs] CVS: makestyle refdb-ms,1.1,1.2

[David N. <dav...@us...>]

Update of /cvsroot/refdb/makestyle
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv560

Modified Files:
	refdb-ms 
Log Message:
Now uses 'Makestyle.pm' module instead of 'refdb-ms.pl' library


Index: refdb-ms
===================================================================
RCS file: /cvsroot/refdb/makestyle/refdb-ms,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -U2 -r1.1 -r1.2
--- refdb-ms	12 Aug 2004 13:46:48 -0000	1.1
+++ refdb-ms	19 Sep 2005 12:02:07 -0000	1.2
@@ -1,9 +1,11 @@
 #!/usr/bin/perl
 
-=head1 RefDB MakeStyle (refdb-ms)
+=head1 NAME
+
+refdb-ms - RefDB MakeStyle, a bibliography style generator for RefDB
 
 =head1 Summary
 
-A utility to aid the generation of RefDB Styles.
+A utility to aid the generation of RefDB bibliography styles for RefDB <refdb.sourceforge.net>.
 
 =head1 Requirements
@@ -11,13 +13,18 @@
 One of the design goals for this utility was to minimise external dependencies.
 
-B<refdb-ms.pl> is a custom library needed by this script and is distributed with it.
+=over
+
+=item Refdb::Makestyle
+
+A custom module containing methods and attributes used by this script.
 
-See C<refdb-ms.pl> documentation for its dependencies.
+Debian package: libperl-refdb-makestyle.
+
+=back
 
 =cut
 
 use strict;
-
-require "refdb-ms.pl";
+use Refdb::Makestyle;
 
 $ENV{'CLUI_DIR'} = "OFF"; 
@@ -43,5 +50,5 @@
 =cut
 
-print "RefDB MakeStyle -- a utility to aid in the generation of RefDB styles.\n";
+print "RefDB MakeStyle -- generate bibliography styles for RefDB.\n";
 $ui->help_system() if $ui->_input_confirm( "Do you require help?" );
 
@@ -54,5 +61,6 @@
 =cut
 
-my ( $current_element , @choice , $child ) = ( $ui->get_root()->get_last_incomplete() );
+my ( $current_element , @choice , $child ) =
+	( $ui->get_root()->get_last_incomplete() );
 $current_element->add_attributes();
 $current_element->enter_value();

[Refdb-cvs] CVS: makestyle Makestyle.pm,NONE,1.1

[David N. <dav...@us...>]

Update of /cvsroot/refdb/makestyle
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32708

Added Files:
	Makestyle.pm 
Log Message:
Changed perl library 'refdb-ms.pl' into module


--- NEW FILE ---
package Refdb::Makestyle;

use 5.008007;
use strict;
use warnings;
use base qw(Exporter);

our $VERSION = '1.00';

=head1 NAME

Refdb::Makestyle - methods used by refdb-ms (RefDB style generator)

=head1 SUMMARY

Makestyle.pm - a module used by I<refdb-ms> (RefDB MakeStyle) -- a utility that generates Refdb bibliography I<style>s.

Provides C<< Element >> and C<< Attribute >> classes for use in generating Refdb I<style>s.

[...6212 lines suppressed...]

=back

=cut

1;

__END__

=head1 AUTHOR

David Nebauer, david E<lt>atE<gt> nebauer E<lt>dotE<gt> org

=head1 COPYRIGHT AND LICENSE

Copyright (C) 2004 by David Nebauer

This library is distributed under the same license and conditions as the C<Refdb> project E<lt>L<http://refdb.sourceforge.net/>E<gt>.

=cut

[Refdb-cvs] CVS: makestyle README,1.1,NONE

[David N. <dav...@us...>]

Update of /cvsroot/refdb/makestyle
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32352

Removed Files:
	README 
Log Message:


--- README DELETED ---

[Refdb-cvs] CVS: makestyle refdb-ms.pl,1.4,NONE

[David N. <dav...@us...>]

Update of /cvsroot/refdb/makestyle
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31924

Removed Files:
	refdb-ms.pl 
Log Message:


--- refdb-ms.pl DELETED ---

[Refdb-cvs] CVS: refdb/src backend-html.c,1.27.2.4,1.27.2.5 backend-scrn.c,1.17.2.3,1.17.2.4 backend.c,1.27.2.7,1.27.2.8 risdb.c,1.44.2.10,1.44.2.11 risxhandler.c,1.28.2.12,1.28.2.13

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21729

Modified Files:
      Tag: Release_0_9_5_stable
	backend-html.c backend-scrn.c backend.c risdb.c risxhandler.c 
Log Message:
fixed ulink handling

Index: backend-html.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend-html.c,v
retrieving revision 1.27.2.4
retrieving revision 1.27.2.5
diff -u -U2 -r1.27.2.4 -r1.27.2.5
--- backend-html.c	7 Sep 2005 23:45:00 -0000	1.27.2.4
+++ backend-html.c	18 Sep 2005 22:51:24 -0000	1.27.2.5
@@ -1370,4 +1370,6 @@
     int i;
     char *entitize_string;
+    char keytype[5][10] = {"URL", "PDF", "FULLTEXT", "RELATED", "IMAGE"};
+    char buffer[64];
 
     /* loop over all link types */
@@ -1379,5 +1381,6 @@
 
       while ((item = get_ulink(dbires)) != NULL) {
-	if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "<p class='ur'><a href=\"", ptr_rendinfo->ptr_ref_len, 0)) == NULL) {
+	sprintf(buffer, "<p class='ur'>%s: <a href=\"", keytype[i]);
+	if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), buffer, ptr_rendinfo->ptr_ref_len, 0)) == NULL) {
 	  LOG_PRINT(LOG_CRIT, get_status_msg(801));
 	  clean_request(dbires);
@@ -1432,5 +1435,4 @@
 
 	free(entitize_string);
-	clean_request(dbires);
 
 	if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "</a></p>\n", ptr_rendinfo->ptr_ref_len, 0)) == NULL) {
@@ -1442,4 +1444,5 @@
 	}
       } /* end while */
+      clean_request(dbires);
     } /* end for */
   }

Index: backend-scrn.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend-scrn.c,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -u -U2 -r1.17.2.3 -r1.17.2.4
--- backend-scrn.c	7 Sep 2005 23:45:01 -0000	1.17.2.3
+++ backend-scrn.c	18 Sep 2005 22:51:25 -0000	1.17.2.4
@@ -746,6 +746,6 @@
 	}
 
-	clean_request(dbires);
       } /* end while */
+      clean_request(dbires);
     } /* end for */
   }

Index: backend.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend.c,v
retrieving revision 1.27.2.7
retrieving revision 1.27.2.8
diff -u -U2 -r1.27.2.7 -r1.27.2.8
--- backend.c	11 Sep 2005 19:55:11 -0000	1.27.2.7
+++ backend.c	18 Sep 2005 22:51:25 -0000	1.27.2.8
@@ -2001,5 +2001,5 @@
   }
 
-  sprintf(sql_command, "SELECT t_link.link_url FROM t_link, t_xlink WHERE t_link.link_id=t_xlink.link_id AND t_xlink.xlink_type=\'%s\' AND t_xlink.xlink_source=\'%s\' AND t_xlink.xref_id="ULLSPEC, keytype[mode], keymode[mode], (unsigned long long)n_id);
+  sprintf(sql_command, "SELECT t_link.link_url FROM t_link, t_xlink WHERE t_link.link_id=t_xlink.link_id AND t_xlink.xlink_type=\'%s\' AND t_xlink.xlink_source=\'%s\' AND t_xlink.xref_id="ULLSPEC, keytype[type], keymode[mode], (unsigned long long)n_id);
 
   LOG_PRINT(LOG_DEBUG, sql_command);

Index: risdb.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/risdb.c,v
retrieving revision 1.44.2.10
retrieving revision 1.44.2.11
diff -u -U2 -r1.44.2.10 -r1.44.2.11
--- risdb.c	11 Sep 2005 20:01:20 -0000	1.44.2.10
+++ risdb.c	18 Sep 2005 22:51:25 -0000	1.44.2.11
@@ -578,4 +578,18 @@
     }
 
+    /* search orphans in t_ulink */
+    result = remove_ulink_entries(n_refdb_id, conn, 0 /* reference */);
+    if (result != 0 && result != 4) {
+      sprintf(sql_command, "253:"ULLSPEC"\n", (unsigned long long)(set_count + nongeek_offset));
+      if ((new_msgpool = mstrcat(*ptr_msg_pool, sql_command, ptr_msg_pool_len, 0)) == NULL) {
+	return 0;
+      }
+      else {
+	*ptr_msg_pool = new_msgpool;
+      }
+      retval = 1;
+      goto cleanup;
+    }
+
     /* search orphans in t_periodical */
     sprintf(sql_command, "SELECT refdb_periodical_id FROM t_refdb WHERE refdb_id="ULLSPEC, (unsigned long long)n_refdb_id);
@@ -3273,5 +3287,5 @@
   dbi_result dbires2;
 
-  sprintf(sql_command, "SELECT link_id, xlink_id FROM t_xlink WHERE xlink_type=\'%s\' AND xref_id="ULLSPEC, (mode) ? "NOTE":"REFERENCE", (unsigned long long)ref_id);
+  sprintf(sql_command, "SELECT link_id, xlink_id FROM t_xlink WHERE xlink_source=\'%s\' AND xref_id="ULLSPEC, (mode) ? "NOTE":"REFERENCE", (unsigned long long)ref_id);
   LOG_PRINT(LOG_DEBUG, sql_command);
   dbires = dbi_conn_query(conn, sql_command);

Index: risxhandler.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/risxhandler.c,v
retrieving revision 1.28.2.12
retrieving revision 1.28.2.13
diff -u -U2 -r1.28.2.12 -r1.28.2.13
--- risxhandler.c	7 Sep 2005 23:45:03 -0000	1.28.2.12
+++ risxhandler.c	18 Sep 2005 22:51:25 -0000	1.28.2.13
@@ -357,4 +357,27 @@
 	/* else: all fine */
 
+	/* search orphans in t_ulink */
+	result = remove_ulink_entries(ptr_ardata->n_refdb_id, ptr_ardata->conn, 0 /* reference */);
+	if (result != 0 && result != 4) {
+	  if (result == 1) {
+	    strcpy(sql_command, "select from t_xuser failed\n");
+	  }
+	  else if (result == 3) {
+	    strcpy(sql_command, "delete from t_xuser failed\n");
+	  }
+
+	  (ptr_ardata->ndb_error)++;
+
+	  if ((new_msgpool = mstrcat(ptr_ardata->msgpool, sql_command, &(ptr_ardata->msgpool_len), 0)) == NULL) {
+	    (ptr_ardata->nmem_error)++;
+	    return;
+	  }
+	  else {
+	    ptr_ardata->msgpool = new_msgpool;
+	  }
+	  return;
+	}
+	/* else: all fine */
+
 	/* search orphans in t_periodical */
 	sprintf(sql_command, "SELECT refdb_periodical_id FROM t_refdb WHERE refdb_id="ULLSPEC, (unsigned long long)(ptr_ardata->n_refdb_id));

[Refdb-cvs] CVS: refdb/src refdbdbib.c,1.36.2.24,1.36.2.25

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6267

Modified Files:
      Tag: Release_0_9_5_stable
	refdbdbib.c 
Log Message:
fix rewinding in send_stylespec()

Index: refdbdbib.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdbib.c,v
retrieving revision 1.36.2.24
retrieving revision 1.36.2.25
diff -u -U2 -r1.36.2.24 -r1.36.2.25
--- refdbdbib.c	11 Sep 2005 19:55:12 -0000	1.36.2.24
+++ refdbdbib.c	17 Sep 2005 21:36:53 -0000	1.36.2.25
@@ -2502,4 +2502,5 @@
   int i; /* guess what */
   int error; /* if not 0 an error occurred */
+  int haverow;
   unsigned long long n_id;
   char inbuffer[COMMAND_INBUF_LEN]; /* buffer for incoming data */
@@ -2696,9 +2697,12 @@
   }
 
-  /* rewind */
-  dbi_result_first_row(dbires_ref);
+
+  /* rewind. we can't jump to the first row and then use next_row as
+     this would skip the first row. Instead we use next_row at the
+     bottom of the while loop */
+  haverow = dbi_result_first_row(dbires_ref);
 
   /* loop over all publication types */
-  while (dbi_result_next_row(dbires_ref)) {
+  while (haverow) {
     item_pubtype = dbi_result_get_string_idx(dbires_ref, 1); /* 1-base index */
 
@@ -2721,4 +2725,5 @@
       } /* end if */
     } /* end for */
+    haverow = dbi_result_next_row(dbires_ref);
   } /* end while */
 

[Refdb-cvs] CVS: refdb/src refdbda.c,1.41.2.18,1.41.2.19

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6023

Modified Files:
      Tag: Release_0_9_5_stable
	refdbda.c 
Log Message:
added db_timeout option

Index: refdbda.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbda.c,v
retrieving revision 1.41.2.18
retrieving revision 1.41.2.19
diff -u -U2 -r1.41.2.18 -r1.41.2.19
--- refdbda.c	11 Sep 2005 19:55:12 -0000	1.41.2.18
+++ refdbda.c	17 Sep 2005 21:35:37 -0000	1.41.2.19
@@ -423,8 +423,10 @@
   else if (!strcmp(ptr_clrequest->dbserver, "sqlite")) {
     dbi_conn_set_option(conn, "sqlite_dbdir", ptr_clrequest->db_path);
+    dbi_conn_set_option_numeric(conn, "sqlite_timeout", ptr_clrequest->db_timeout);
   }
   else if (!strcmp(ptr_clrequest->dbserver, "sqlite3")) {
     dbi_conn_set_option(conn, "sqlite3_dbdir", ptr_clrequest->db_path);
     dbi_conn_set_option(conn, "encoding", "UTF-8");
+    dbi_conn_set_option_numeric(conn, "sqlite3_timeout", ptr_clrequest->db_timeout);
   }
 

[Refdb-cvs] CVS: refdb/src refdbd.c,1.74.2.15,1.74.2.16 refdbd.h.in,1.7.2.9,1.7.2.10

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5783

Modified Files:
      Tag: Release_0_9_5_stable
	refdbd.c refdbd.h.in 
Log Message:
added db_timeout option

Index: refdbd.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbd.c,v
retrieving revision 1.74.2.15
retrieving revision 1.74.2.16
diff -u -U2 -r1.74.2.15 -r1.74.2.16
--- refdbd.c	29 Jul 2005 21:15:41 -0000	1.74.2.15
+++ refdbd.c	17 Sep 2005 21:34:31 -0000	1.74.2.16
@@ -62,5 +62,5 @@
 #endif
 
-Prefs prefs[22] = {
+Prefs prefs[23] = {
   {"serverip", ""},
   {"timeout", ""},
@@ -84,4 +84,5 @@
   {"in_encoding", ""},
   {"nongeek_offset", ""},
+  {"db_timeout", ""},
   {"", ""}
 };
@@ -114,4 +115,5 @@
 char keyword_scan[PREFS_BUF_LEN] = ""; /* run automatic keyword scan if 't' */
 char ng_offset[PREFS_BUF_LEN] = "1"; /* 0 for geeks, 1 for humans */
+char db_timeout[PREFS_BUF_LEN] = "60000"; /* db-engine specific timeout */
 
 char confdir[_POSIX_PATH_MAX+1] = ""; /* path to the config files */
@@ -245,4 +247,5 @@
   prefs[19].varvalue = default_input_encoding;
   prefs[20].varvalue = ng_offset;
+  prefs[21].varvalue = db_timeout;
 
   *dbi_driver_dir = '\0';
@@ -274,5 +277,5 @@
 
   /* read command line settings. These may override the config file settings */
-  while ((n_opt = getopt(argc, argv, "b:d:D:e:E:hi:IkKl:L:p:P:qrsT:UvVy:Y:")) != -1) {
+  while ((n_opt = getopt(argc, argv, "b:d:D:e:E:hi:IkKl:L:m:p:P:qrsT:UvVy:Y:")) != -1) {
     switch (n_opt) {
     case 'b':
@@ -297,5 +300,5 @@
       break;
     case 'h':
-      fprintf(stderr, "Usage: refdbd [-b dbs_port] [-d database] [-D dbserver] [-e dest] [-E encoding] [-h] [-i address] [-I] [-k] [-K] [-l level] [-L file] [-p port] [-P PIDfile] [-q] [-r] [-s] [-T time] [-u] [-v] [-V] [-y confdir] [-Y driverdir]\nOptions: -b set database server port\n         -D select database server (mysql|pgsql|sqlite|sqlite3)\n         -e set log destination to dest (0-2)\n         -h prints this help\n         -i set server IP address to address\n         -I allow remote connections\n         -k keep periodical names when deleting references\n         -K activate automatic keyword scan\n         -l set the log level to level (0<=level<=7)\n         -L use file as log-file (full path)\n         -p set refdbd port\n         -P set path to PID file\n         -q ignore init-file\n         -r allow remote administration\n         -s run standalone, not as daemon\n         -T set timeout to time\n         -U uppercase citation keys (for SGML)\n         -v show version information\n         -V switch to verbose mode\n         -y look for configuration files in confdir\n         -Y look for dbi drivers in driverdir\n");
+      fprintf(stderr, "Usage: refdbd [-b dbs_port] [-d database] [-D dbserver] [-e dest] [-E encoding] [-h] [-i address] [-I] [-k] [-K] [-l level] [-L file] [-m time] [-p port] [-P PIDfile] [-q] [-r] [-s] [-T time] [-u] [-v] [-V] [-y confdir] [-Y driverdir]\nOptions: -b set database server port\n         -D select database server (mysql|pgsql|sqlite|sqlite3)\n         -e set log destination to dest (0-2)\n         -h prints this help\n         -i set server IP address to address\n         -I allow remote connections\n         -k keep periodical names when deleting references\n         -K activate automatic keyword scan\n         -l set the log level to level (0<=level<=7)\n         -L use file as log-file (full path)\n         -m set database timeout to time\n         -p set refdbd port\n         -P set path to PID file\n         -q ignore init-file\n         -r allow remote administration\n         -s run standalone, not as daemon\n         -T set timeout to time\n         -U uppercase citation keys (for SGML)\n         -v show version information\n         -V switch to verbose mode\n         -y look for configuration files in confdir\n         -Y look for dbi drivers in driverdir\n");
       free(ptr_clrequest);
       exit (0);
@@ -322,4 +325,8 @@
       log_file[PREFS_BUF_LEN-1] = '\0';
       break;
+    case 'm':
+      strncpy(db_timeout, optarg, PREFS_BUF_LEN);
+      db_timeout[PREFS_BUF_LEN - 1] = '\0';
+      break;
     case 'p':
       strncpy(port_address, optarg, PREFS_BUF_LEN);
@@ -381,4 +388,5 @@
   n_remote_connect = (*remote_connect == 't') ? 1:0; 
   nongeek_offset = atoi(ng_offset);
+  ptr_clrequest->db_timeout = atoi(db_timeout);
 
   /* uppercase the encoding names */
@@ -1184,4 +1192,5 @@
 	      dbi_initialize(NULL);
 	    }
+
 	    LOG_PRINT(LOG_INFO, "dbi is up");
 	    n_dbi_is_up++;
@@ -1771,4 +1780,6 @@
 	      ptr_biblio_info->encoding = ptr_child_clrequest->db_encoding;
 
+/* 	    printf("child sleeps PID=%d\n", getpid()); */
+/* 	    sleep(10); */
 	      retval = getbib(ptr_child_clrequest, ptr_biblio_info, ref_format, n_send_stylespec, ptr_addresult);
 

Index: refdbd.h.in
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbd.h.in,v
retrieving revision 1.7.2.9
retrieving revision 1.7.2.10
diff -u -U2 -r1.7.2.9 -r1.7.2.10
--- refdbd.h.in	7 Sep 2005 23:45:02 -0000	1.7.2.9
+++ refdbd.h.in	17 Sep 2005 21:34:32 -0000	1.7.2.10
@@ -43,4 +43,5 @@
   int inargc; /* number of parsed arguments */
   int protocol; /* protocol version */
+  int db_timeout; /* db-engine specific timeout (sqlite/sqlite3) */
   char** inargv; /* ptr to array of parsed arguments */
   char username[USERNAME_LENGTH]; /* username for database authentication */

[Refdb-cvs] CVS: refdb/src linklist.c,1.9.2.2,1.9.2.3

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5328/src

Modified Files:
      Tag: Release_0_9_5_stable
	linklist.c 
Log Message:
added missing include for malloc()

Index: linklist.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/linklist.c,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -U2 -r1.9.2.2 -r1.9.2.3
--- linklist.c	29 Jul 2005 21:15:34 -0000	1.9.2.2
+++ linklist.c	17 Sep 2005 21:30:32 -0000	1.9.2.3
@@ -21,4 +21,5 @@
 
 #include <stdio.h> /* for a definition of NULL */
+#include <stdlib.h> /* for malloc */
 #include "linklist.h"
 

[Refdb-cvs] CVS: refdb configure.in,1.49.2.17,1.49.2.18

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5095

Modified Files:
      Tag: Release_0_9_5_stable
	configure.in 
Log Message:
removed refdb_url option; added phpweb to server build

Index: configure.in
===================================================================
RCS file: /cvsroot/refdb/refdb/configure.in,v
retrieving revision 1.49.2.17
retrieving revision 1.49.2.18
diff -u -U2 -r1.49.2.17 -r1.49.2.18
--- configure.in	15 Aug 2005 00:09:03 -0000	1.49.2.17
+++ configure.in	17 Sep 2005 21:29:25 -0000	1.49.2.18
@@ -58,8 +58,8 @@
 
 dnl need the URL where the web interface HTML files are installed
-AC_ARG_WITH(refdb_url,
-	[  --with-refdb-url=URL          Root URL for the web interface HTML files],
-	[refdb_url=$withval],
-	[refdb_url=""])
+dnl AC_ARG_WITH(refdb_url,
+dnl 	[  --with-refdb-url=URL          Root URL for the web interface HTML files],
+dnl	[refdb_url=$withval],
+dnl	[refdb_url=""])
 
 dnl need a path to write a pid file
@@ -131,5 +131,5 @@
 
 if test "$ac_server" = "YES"; then
-server_subdirs="etc examples scripts src"
+server_subdirs="etc examples scripts src phpweb"
 server_bins="refdbd\$(EXEEXT)"
 server_scripts="refdb-bug refdbctl"
@@ -294,5 +294,5 @@
 AC_SUBST(tei_xsl)
 AC_SUBST(classpath_root)
-AC_SUBST(refdb_url)
+dnl AC_SUBST(refdb_url)
 AC_SUBST(log_dir)
 AC_SUBST(var_dir)
@@ -367,5 +367,5 @@
 fi dnl end if build clients
 
-AC_OUTPUT(src/Makefile scripts/Makefile etc/Makefile doc/Makefile dtd/Makefile declarations/Makefile examples/Makefile styles/Makefile dsssl/Makefile dsssl/refdb/Makefile dsssl/refdb/html/Makefile dsssl/refdb/print/Makefile dsssl/refdb/lib/Makefile xsl/Makefile xsl/refdb/Makefile xsl/refdb/common-refdb/Makefile xsl/refdb/docbk-refdb-xsl/Makefile xsl/refdb/docbk-refdb-xsl/docbk-fo/Makefile xsl/refdb/docbk-refdb-xsl/docbk-html/Makefile xsl/refdb/docbk-refdb-xsl/docbk-xhtml/Makefile xsl/refdb/docbk-refdb-xsl/docbk-lib/Makefile xsl/refdb/tei-refdb-xsl/Makefile xsl/refdb/tei-refdb-xsl/tei-fo/Makefile xsl/refdb/tei-refdb-xsl/tei-html/Makefile xsl/refdb/tei-refdb-xsl/tei-lib/Makefile Makefile)
+AC_OUTPUT(src/Makefile scripts/Makefile etc/Makefile doc/Makefile dtd/Makefile declarations/Makefile examples/Makefile styles/Makefile phpweb/Makefile dsssl/Makefile dsssl/refdb/Makefile dsssl/refdb/html/Makefile dsssl/refdb/print/Makefile dsssl/refdb/lib/Makefile xsl/Makefile xsl/refdb/Makefile xsl/refdb/common-refdb/Makefile xsl/refdb/docbk-refdb-xsl/Makefile xsl/refdb/docbk-refdb-xsl/docbk-fo/Makefile xsl/refdb/docbk-refdb-xsl/docbk-html/Makefile xsl/refdb/docbk-refdb-xsl/docbk-xhtml/Makefile xsl/refdb/docbk-refdb-xsl/docbk-lib/Makefile xsl/refdb/tei-refdb-xsl/Makefile xsl/refdb/tei-refdb-xsl/tei-fo/Makefile xsl/refdb/tei-refdb-xsl/tei-html/Makefile xsl/refdb/tei-refdb-xsl/tei-lib/Makefile Makefile)
 
 echo

[Refdb-cvs] CVS: refdb Makefile.am,1.15.2.2,1.15.2.3

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4852

Modified Files:
      Tag: Release_0_9_5_stable
	Makefile.am 
Log Message:
removed leftover doc hacks

Index: Makefile.am
===================================================================
RCS file: /cvsroot/refdb/refdb/Makefile.am,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -U2 -r1.15.2.2 -r1.15.2.3
--- Makefile.am	15 Aug 2005 00:09:03 -0000	1.15.2.2
+++ Makefile.am	17 Sep 2005 21:28:11 -0000	1.15.2.3
@@ -10,6 +10,4 @@
 	$(mkinstalldirs) $(distdir)/conf
 	cp -p conf/config.guess conf/config.sub conf/install-sh conf/missing conf/mkinstalldirs $(distdir)/conf
-	$(mkinstalldirs) $(distdir)/doc
-	cp -p doc/*.sgml doc/*.eps doc/*.pdf doc/*.png doc/catalog doc/readme.txt doc/tex2mail.README doc/Makefile $(distdir)/doc
 
 install-data-local:

[Refdb-cvs] CVS: refdb/phpweb INSTALL,1.2.2.2,1.2.2.3

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/phpweb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1888

Modified Files:
      Tag: Release_0_9_5_stable
	INSTALL 
Log Message:
RefDB integration

Index: INSTALL
===================================================================
RCS file: /cvsroot/refdb/refdb/phpweb/INSTALL,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -U2 -r1.2.2.2 -r1.2.2.3
--- INSTALL	7 Sep 2005 21:31:45 -0000	1.2.2.2
+++ INSTALL	17 Sep 2005 21:14:28 -0000	1.2.2.3
@@ -4,14 +4,48 @@
 Quick Note:
 
-This interface was designed with the hope that the command syntax for the refdbc and refdba clients would remain the same even if the backends change.  It is also designed in such a manner that absolutely nothing about how you compiled refdb should make a difference.  
-
-Install: 
-
-With that said to "install" this web interface all you need to do is copy all the files to the www directory that refdb creates for itself. The default being /usr/local/share/refdb/www.
-
-IMPORTANT:  PHP must have write permissions in the directory that contains these files for the addref functions to work
+This interface was designed with the hope that the command syntax for
+the refdbc and refdba clients would remain the same even if the
+backends change.  It is also designed in such a manner that absolutely
+nothing about how you compiled refdb should make a difference.
+
+IMPORTANT: PHP must have write permissions in the directory that
+contains these files for the addref functions to work. By default the
+directory is set up with permission 1777 (read/writeable for everyone
+with the sticky bit set).
 
 
 Web Server:
 
-For instructions on how to set your web server up to alias /usr/local/share/refdb/www to a web accessible path, refer to the RefDB manual.
+Setting up the web interface requires changes to your web server setup
+and to your PHP setup. The instructions below assume Apache as the web
+server, but a similar setup should be possible with any other web
+server as well. Your web server must have mod_php5 installed. mod_php5
+requires session support which must be installed separately on some
+operating systems.
+
+httpd.conf:
+
+<IfModule mod_alias.c>
+...
+    Alias /refdb/ "/usr/local/share/refdb/www/"
+
+    <Directory "/usr/local/share/refdb/www">
+        Options  +ExecCGI
+        AllowOverride None
+        Order allow,deny
+        Allow from all
+        AddType application/x-httpd-php .php .phtml
+    </Directory>
+...
+</IfModule>
+
+With this setup you can type "localhost/refdb/" (if you access the web
+interface locally) or "servername/refdb/" (remote access) into your
+browser to jump right to the login form. Note the trailing slashes in
+both cases.
+
+php.ini:
+session.save_path = "/tmp"
+session.use_cookies = 1
+session.auto_start = 1
+register_globals = On

[Refdb-cvs] CVS: refdb/phpweb refdbsearch.php.in,NONE,1.1.2.1

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/phpweb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31614

Added Files:
      Tag: Release_0_9_5_stable
	refdbsearch.php.in 
Log Message:
replaces refdbsearch.php

--- NEW FILE ---
<?
require_once("include.php");

//This function builds the string for the display fields option
//It uses the morefields array to associate the html value with 
//the refdbc identified value
function setSearchFields($_POST, $morefields)
{
	$searchFields = "";
	while( list($key,$val) = each($morefields))
	{
		if(isset($_POST[$key]) )
		{
			$searchFields .= $val;
		}
	}
	if( $searchFields == "" )
	{
		$searchFields = "ALL";
	}
	return $searchFields;
}
?>

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
  <head>
    <title>RefDB query results</title>
    <link href="refdbq.css" type="text/css" rel="stylesheet">
  </head>
  <body>
    <table width="100%" cellspacing="0" border>

      <tbody valign="top">
	<tr>
	  <td class="navbar" width="25%"><h1>RefDB</h1></td>
	  <td class="main"><h1>Query Results</h1></td>
	</tr>
	<tr>
	  <td class="navbar">&nbsp;</td>
	  <td class="main">&nbsp;</td>

	</tr>
	<tr>
	  <td class="navbar">
	    <p><a href="refdbquery.html">Search references</a></p>
	    <p><a href="refdbkajquery.html">Search keywords, authors, journals</a></p>
	    <p><a href="refdbadd.html">Add new references</a></p>
	    <p><a href="refdbdbquery.php">Change database</a></p>
	    <p><a href="refdblogout.php">Logout</a></p>
	  </td>
	  <td class="main">
	      <table border>


<thead><tr><th class="result">Matching References</th></tr>
<tr><td class="result">

 <form action="refdb-prl-del.php" method="post" enctype="multipart/form-data"> 
	<input type="submit" value="Delete selected references" name="deleteref">&nbsp;
	<input type="submit" value="Add selected references to Personal List" name="pickref">&nbsp;
	<input type="submit" value="Remove selected references from Personal List" name="unpickref"></td></tr></thead><tbody>
<?
$database = $_SESSION["database"];
$name = $_SESSION["name"];
$passwd = $_SESSION["passwd"];
$refdbc = $_SESSION["refdbc"];

$cmd = "$refdbc -c stdout -d $database -u $name -w $passwd -F ";

$searchFields = setSearchFields($_POST, $morefields);

$cmd = $cmd.$searchFields." -C getref ";

//Search just the personal reference list
if($scope == "prl")
{
	$cmd = $cmd."-p ";
}

$terms = "";

//The following if sets the query for the Simple Query
//It builds the refdbc query using the fields and ops  arrays
//from include.php 
if( $sendQuery == "Send Simple query")
{
	$first = true;
	if( $simpquery1 != ""  )
	{
		$field1 = $fields[$simpquery1field];
		$equals1 = $equals[$simpquery1equals];
		$terms = $terms.$field1.$equals1.$simpquery1." ";
		$first = false;
	}
	if( $simpquery2 != ""  )
	{
		$field2 = $fields[$simpquery2field];
		$equals2 = $equals[$simpquery2equals];
		if( $first)
		{
			$terms = $terms.$field2.$equals2.$simpquery2." ";
			$first = false;
		}
		else
		{
			$op1 = $ops[$simpquery1op];
			$terms = $terms.$op1." ".$field2.$equals2.$simpquery2." ";
		}
	}
	if( $simpquery3 != ""  )
	{
		$field3 = $fields[$simpquery3field];
		$equals3 = $equals[$simpquery3equals];
		if( $first)
		{
			$terms = $terms.$field3.$equals3.$simpquery3." ";
			$first = false;
		}
		else
		{
			$op2 = $ops[$simpquery2op];
			$terms = $terms.$op2." ".$field3.$equals3.$simpquery3." ";
		}
	}
	if( $simpquery4 != "" )
	{
		$field4 = $fields[$simpquery4field];
		$equals4 = $equals[$simpquery4equals];
		if( $first)
		{
			$terms = $terms.$field4.$equals4.$simpquery4." ";
			$first = false;
		}
		else
		{
			$op3 = $ops[$simpquery3op];
			$terms = $terms.$op3." ".$field4.$equals4.$simpquery4." ";
		}
	}
}
//Build the advance query
else if( $sendQuery == "Send Advanced query" )
{
	$terms = $advquery;
}
//Query terms if you've returned from a search
else if( $sendQuery == "Return to Search Results" )
{
	$terms = $return;
}

$cmd = $cmd.$terms;

exec($cmd, $lines);

?><tr><td><div><?
$checkboxNumber = 0;

//If the search generates no results
if( count($lines) <=1 )
{
	print "<br>Your Search for <b>$terms</b> generated no results<br><br>\n";
}
//Your search generated results display them
else
{
  $lineNumber = 1;
  foreach( $lines as $line )
  {
  	//If this is the first line of a new reference it will contain the ID field
	if( substr($line,0,2) == "ID" )
	{
		$lineNumber = 1;
		print "</div></td></tr>\n";
		print "<tr><td class='result'>\n";
		
		//strip the ID number out of the reference
		$colon = strpos($line, ':');
		$space = strpos($line, " ");
		$id = substr($line,$colon+1,$space-$colon-1);
		
		++$checkboxNumber;
		print "<input type='checkbox' name='checkbox$checkboxNumber' value='$id'>&nbsp;\n";
		print "<input type='submit' value='Edit' name='editid$id'>\n";
		print "<div class='record'>\n";
		print "<h2 class='ID'>$line</h2>\n";
		$lineNumber++;
	}
	elseif( substr($line,0,3) == "Key" )
	{
		print "<p class='citekey'>$line</p>\n";
		$lineNumber++;
	}
	elseif($lineNumber == 3)
	{
		print "<p class='authors'>Authors: $line</p>\n";
		$lineNumber++;
	}
	elseif($lineNumber == 4)
	{
		print "<p class='title'>$line</p>\n";
		$lineNumber++;
	}
	elseif($lineNumber == 5)
	{
		print "<p><em class='periodical'>$line</em></p>\n";
		$lineNumber++;
	}
	elseif( substr($line,0,8) == "ABSTRACT")
	{
		print "<p class='abstract'>$line</p>\n";
	}
	elseif( substr($line,0,7) == "REPRINT" )
	{
		print "<p class='reprint'>$line</p>\n";
	}
	elseif( substr($line,0,4) == "ISSN")
	{
		print "<p class='issn'>$line</p>\n";
	}
	elseif( substr($line,0,4) == "CITY")
	{
		print "<p class='city'>$line</p>\n";
	}
	elseif( substr($line,0,5) == "NOTES" )
	{
		print "<p class='notes'>$line</p>\n";
	}
	elseif( substr($line,0,3) == "URL" )
	{
		$len = strlen($line);
		$url = substr($line, 4,$len);
		print "<p class='url'><a href='$url'>$line</a></p>\n";
	}
	elseif( substr($line,0,9) == "PUBLISHER")
	{
		print "<p class='publisher'>$line</p>\n";
	}
	else
	{
		print "<p>$line</p>\n";
	}
  }
}
print "<input type='hidden' name='terms' value='$terms'>\n";
print "<input type='hidden' name='scope' value='$scope'>\n";
print "<input type='hidden' name='numberOfCheckBoxes' value='$checkboxNumber'>\n";
?>
</tbody>
</table>
</form>
</td>
</tr>
<tr>
	<td class="navbar"><p><a href="refdbadmin.php">Admin Interface</a></p></td>
	<td class="footer"><p><a href="http://refdb.sourceforge.net">RefDB</a> reference manager and bibliography tool V. <!--VERSION-->Version<!--/VERSION--></p></td>
</tr>
</tbody>
</table>
</body>

</html>

[Refdb-cvs] CVS: refdb/phpweb refdbsearch.php,1.1.2.4,NONE

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/phpweb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31500

Removed Files:
      Tag: Release_0_9_5_stable
	refdbsearch.php 
Log Message:
replaced by refdbsearch.php.in

--- refdbsearch.php DELETED ---

[Refdb-cvs] CVS: refdb/phpweb refdbquery.html.in,NONE,1.1.2.1

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/phpweb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31260

Added Files:
      Tag: Release_0_9_5_stable
	refdbquery.html.in 
Log Message:
replaces refdbquery.html

--- NEW FILE ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
  <head>
    <title>RefDB query form</title>
    <link href="refdbq.css" type="text/css" rel="stylesheet">
  </head>
  <body>
    <table width="100%" cellspacing="0" border>
      <tbody valign="top">
	<tr>
	  <td class="navbar" width="25%"><h1>RefDB</h1></td>
	  <td class="main"><h1>Reference Query Form</h1></td>
	</tr>
	<tr>
	  <td class="navbar">&nbsp;</td>
	  <td class="main">&nbsp;</td>
	</tr>
	<tr>
	  <td class="navbar">
	    <p>Search references</p>
	    <p><a href="refdbkajquery.html">Search keywords, authors, journals</a></p>
	    <p><a href="refdbadd.html">Add new references</a></p>
	    <p><a href="refdbdbquery.php">Change database</a></p>
	    <p><a href="refdblogout.php">Logout</a></p>
	  </td>
	  <td class="main">
	    <form action="refdbsearch.php" method="post" enctype="multipart/form-data">
	   	<p>Display also the following fields:</p>
		<p>
		<input type="checkbox" name="Notes" value="N1">Notes&nbsp;
		<input type="checkbox" name="Abstract" value="N2">Abstract&nbsp;
		<input type="checkbox" name="Address" value="AD">Address&nbsp;
		<input type="checkbox" name="Reprint" value="RP">Reprint&nbsp;
		<input type="checkbox" name="ISSN" value="SN">ISSN&nbsp;
		<input type="checkbox" name="URL" value="UR">URL&nbsp;
		<input type="checkbox" name="Publisher" value="PB">Publisher&nbsp;
		<input type="checkbox" name="City" value="CY">City&nbsp;
		<input type="checkbox" name="U1" value="U1">U1&nbsp;
		<input type="checkbox" name="U2" value="U2">U2&nbsp;
		<input type="checkbox" name="U3" value="U3">U3&nbsp;
		<input type="checkbox" name="U4" value="U4">U4&nbsp;
		<input type="checkbox" name="U5" value="U5">U5&nbsp;
		<input type="checkbox" name="M1" value="M1">M1&nbsp;
		<input type="checkbox" name="M2" value="M2">M2&nbsp;
		<input type="checkbox" name="M3" value="M3">M3&nbsp;
		</p>   

		<p>Scope of your query: <select name="scope">
		  <option value="full">full reference list</option>
		  <option value="prl">personal reference list</option>
		</select>
	      </p>
	      <hr>
	      <h2>Simple query</h2>
	      <p> 
	        Is <select name="simpquery1equals">
			<option value="exact">EXACTLY</option>
			<option value="like" selected>LIKE</option>
		   </select>
	     	<input type="text" name="simpquery1"> in 
	          <select name="simpquery1field">
		  <option value="author">author</option>
		  <option value="editor">editor</option>
		  <option value="seditor">series editor</option>
		  <option value="title">title</option>
		  <option value="booktitle">book title</option>
		  <option value="seriestitle">series title</option>
		  <option value="journaltitle">journal title</option>
		  <option value="keyword">keyword</option>
		</select>
		<select name="simpquery1op">
		  <option value="and">AND</option>
		  <option value="or">OR</option>
		  <option value="not">NOT</option>
		</select>
	      </p>
	      <p> Is <select name="simpquery2equals">
			<option value="exact">EXACTLY</option>
			<option value="like" selected>LIKE</option>
		   </select>
		<input type="text" name="simpquery2"> in <select name="simpquery2field">
		  <option value="author">author</option>
		  <option value="editor">editor</option>
		  <option value="seditor">series editor</option>
		  <option value="title">title</option>
		  <option value="booktitle">book title</option>
		  <option value="seriestitle">series title</option>
		  <option value="journaltitle">journal title</option>
		  <option value="keyword">keyword</option>
		</select>
		<select name="simpquery2op">
		  <option value="and">AND</option>
		  <option value="or">OR</option>
		  <option value="not">NOT</option>
		</select>
	      </p>
	      <p> Is <select name="simpquery3equals">
			<option value="exact">EXACTLY</option>
			<option value="like" selected>LIKE</option>
		   </select>
		<input type="text" name="simpquery3"> in <select name="simpquery3field">
		  <option value="author">author</option>
		  <option value="editor">editor</option>
		  <option value="seditor">series editor</option>
		  <option value="title">title</option>
		  <option value="booktitle">book title</option>
		  <option value="seriestitle">series title</option>
		  <option value="journaltitle">journal title</option>
		  <option value="keyword">keyword</option>
		</select>
		<select name="simpquery3op">
		  <option value="and">AND</option>
		  <option value="or">OR</option>
		  <option value="not">NOT</option>
		</select>
	      </p>
	      <p> Is <select name="simpquery4equals">
			<option value="exact">EXACTLY</option>
			<option value="like" selected>LIKE</option>
		   </select>
		<input type="text" name="simpquery4"> in <select name="simpquery4field">
		  <option value="author">author</option>
		  <option value="editor">editor</option>
		  <option value="seditor">series editor</option>
		  <option value="title">title</option>
		  <option value="booktitle">book title</option>
		  <option value="seriestitle">series title</option>
		  <option value="journaltitle">journal title</option>
		  <option value="keyword">keyword</option>
		</select>
	      </p>
	      <input type="submit" name="sendQuery" value="Send Simple query"><input type="reset" value="Reset form">
	      <hr>
	      <h2>Advanced query</h2>
	      <p>Query string: <input type="text" name="advquery" size="40" maxlength="2048"></p>
	      <input type="submit" name="sendQuery" value="Send Advanced query"><input type="reset" value="Reset form">
	    </form>
	  </td>
	</tr>
	<tr>
	  <td class="navbar"><p><a href="refdbadmin.php">Admin Interface</a></p></td>
	  <td class="footer"><p><a href="http://refdb.sourceforge.net">RefDB</a> reference manager and bibliography tool V. <!--VERSION-->Version<!--/VERSION--></p></td>
	</tr>
      </tbody>
    </table>
  </body>
</html>

[Refdb-cvs] CVS: refdb/phpweb refdbquery.html,1.1.2.3,NONE

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/phpweb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31165

Removed Files:
      Tag: Release_0_9_5_stable
	refdbquery.html 
Log Message:
replaced by refdbquery.html.in

--- refdbquery.html DELETED ---

[Refdb-cvs] CVS: refdb/phpweb refdblogout.php.in,NONE,1.1.2.1

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/phpweb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30930

Added Files:
      Tag: Release_0_9_5_stable
	refdblogout.php.in 
Log Message:
replaces refdblogout.php

--- NEW FILE ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
  <head>
    <title>RefDB logout page</title>
    <link href="refdbq.css" type="text/css" rel="stylesheet">
  </head>
  <body>
    <table width="100%" cellspacing="0" border>
      <tbody valign="top">
	<tr>
	  <td class="navbar" width="25%"><h1>RefDB</h1></td>
	  <td class="main"><h1>Logout</h1></td>
	</tr>
	<tr>
	  <td class="navbar">&nbsp;</td>
	  <td class="main">&nbsp;</td>
	</tr>
	<tr>
	  <td class="navbar">
	    <p><a href="refdbquery.html">Search references</a></p>
	    <p><a href="refdbkajquery.html">Search keywords, authors, journals</a></p>
	    <p><a href="refdbadd.html">Add new references</a></p>
	    <p><a href="refdbdbquery.php">Change database</a></p>
	    <p><a href="refdblogout.php">Logout</a></p>
	  </td>
	  <td class="main">
	      <?
	      	//Destroy session and cookie variables
		setcookie(session_name(), "", time()-3600);
	      	session_destroy();
	      ?>
	      <p>You finished your RefDB session.</p>
	      <p><a href="index.html">Start a new session</a></p>
	  </td>
	</tr>
	<tr>
	  <td class="navbar">&nbsp;</td>
	  <td class="footer"><p><a href="http://refdb.sourceforge.net">RefDB</a> reference manager and bibliography tool V. <!--VERSION-->Version<!--/VERSION--></p></td>
	</tr>
      </tbody>
    </table>
  </body>
</html>

[Refdb-cvs] CVS: refdb/phpweb refdblogout.php,1.1.2.2,NONE

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/phpweb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30861

Removed Files:
      Tag: Release_0_9_5_stable
	refdblogout.php 
Log Message:
replaced by refdblogout.php.in

--- refdblogout.php DELETED ---

[Refdb-cvs] CVS: refdb/phpweb refdbkajsearch.php.in,NONE,1.1.2.1

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/phpweb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30612

Added Files:
      Tag: Release_0_9_5_stable
	refdbkajsearch.php.in 
Log Message:
replaces refdbkajsearch.php

--- NEW FILE ---
<?
//This function sets the proper refdbc command depending
//on the field that you're searching for
function selectField($kajqueryfield)
{
	$get = "";
	switch($kajqueryfield)
	{
		case "keyword":
			$get = "getkw";
			break;
		case "author":
			$get = "getau";
			break;
		case "editor":
			$get = "geted";
			break;
		case "seditor":
			$get = "getas";
			break;
		case "journalfull":
			$get = "getjf";
			break;
		case "journalabbrev":
			$get = "getjo";
			break;
		case "journalabbrev1":
			$get = "getj1";
			break;
		case "journalabbrev2":
			$get = "getj2";
			break;
	}
	return $get;
}
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
  <head>
    <title>RefDB query form</title>
    <link href="refdbq.css" type="text/css" rel="stylesheet">
  </head>
  <body>
    <table width="100%" cellspacing="0" border>
      <tbody valign="top">
	<tr>
	  <td class="navbar" width="25%"><h1>RefDB</h1></td>
	  <td class="main"><h1>Keyword, Author, Journal Query Form</h1></td>
	</tr>
	<tr>
	  <td class="navbar">&nbsp;</td>
	  <td class="main">&nbsp;</td>
	</tr>
	<tr>
	  <td class="navbar">
	    <p><a href="refdbquery.html">Search references</a></p>
	    <p>Search keywords, authors, journals</p>
	    <p><a href="refdbadd.html">Add new references</a></p>
	    <p><a href="refdbdbquery.php">Change database</a></p>
	    <p><a href="refdblogout.php">Logout</a></p>
	  </td>
	  <td class="main">
	     <?
	     	$name = $_SESSION["name"];
		$passwd = $_SESSION["passwd"];
		$database = $_SESSION["database"];
		$refdbc = $_SESSION["refdbc"];

		//build the command
		$cmd = "$refdbc -u $name -w $passwd -d $database -c stdout -C ";
		
		$get = 	selectField($kajqueryfield);

		//kajquery is the search term
		$cmd = $cmd.$get." ".$kajquery;
	     
	     ?>	     	
	      <h2>Results</h2>
	      <table border>
	      <thead><tr>
	      		<th class="result">Matching <?$kajqueryfield?>(s)</th>
		     </tr>
	      </thead>
	      <tbody>
	     <?
		exec($cmd, $lines);
		foreach($lines as $line)
		{
			print "<tr><td class='result'>$line</td></tr>\n";
		}
	     ?>
	     </tbody>
	     </table>
	  </td>
	</tr>
	<tr>
	  <td class="navbar"><p><a href="refdbadmin.php">Admin Interface</a></p></td>
	  <td class="footer"><p><a href="http://refdb.sourceforge.net">RefDB</a> reference manager and bibliography tool V. <!--VERSION-->Version<!--/VERSION--></p></td>
	</tr>
      </tbody>
    </table>
  </body>
</html>

[Refdb-cvs] CVS: refdb/phpweb refdbkajsearch.php,1.1.2.2,NONE

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/phpweb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30536

Removed Files:
      Tag: Release_0_9_5_stable
	refdbkajsearch.php 
Log Message:
replaced by refdbkajsearch.php.in

--- refdbkajsearch.php DELETED ---

[Refdb-cvs] CVS: refdb/phpweb refdbkajquery.html.in,NONE,1.1.2.1

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/phpweb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30220

Added Files:
      Tag: Release_0_9_5_stable
	refdbkajquery.html.in 
Log Message:
replaces refdbkajquery.html

--- NEW FILE ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
  <head>
    <title>RefDB query form</title>
    <link href="refdbq.css" type="text/css" rel="stylesheet">
  </head>
  <body>
    <table width="100%" cellspacing="0" border>
      <tbody valign="top">
	<tr>
	  <td class="navbar" width="25%"><h1>RefDB</h1></td>
	  <td class="main"><h1>Keyword, Author, Journal Query Form</h1></td>
	</tr>
	<tr>
	  <td class="navbar">&nbsp;</td>
	  <td class="main">&nbsp;</td>
	</tr>
	<tr>
	  <td class="navbar">
	    <p><a href="refdbquery.html">Search references</a></p>
	    <p>Search keywords, authors, journals</p>
	    <p><a href="refdbadd.html">Add new references</a></p>
	    <p><a href="refdbdbquery.php">Change database</a></p>
	    <p><a href="refdblogout.php">Logout</a></p>
	  </td>
	  <td class="main">
	    <form action="refdbkajsearch.php" method="post" enctype="multipart/form-data">
	      <h2>Query</h2>
	      <p> <input type="text" name="kajquery"> in <select name="kajqueryfield">
		  <option value="keyword">keywords</option>
		  <option value="author">authors</option>
		  <option value="editor">editors</option>
		  <option value="seditor">series editors</option>
		  <option value="journalfull">journal (full)</option>
		  <option value="journalabbrev">journal (abbrev.)</option>
		  <option value="journalcustabbrev1">journal (custom abbrev. 1)</option>
		  <option value="journalcustabbrev2">journal (custom abbrev. 2)</option>
		</select>
	      </p>
	      <input type="submit" value="Send query"><input type="reset" value="Reset form">
	    </form>
	  </td>
	</tr>
	<tr>
	  <td class="navbar"><p><a href="refdbadmin.php">Admin Interface</a></p></td>
	  <td class="footer"><p><a href="http://refdb.sourceforge.net">RefDB</a> reference manager and bibliography tool V. <!--VERSION-->Version<!--/VERSION--></p></td>
	</tr>
      </tbody>
    </table>
  </body>
</html>