MiniVend 4.03

interchange · Jan 2, 2009 · e8418db · e8418db
1 parent f7a90f3
commit e8418db
Show file tree

Hide file tree

Showing 130 changed files with 15,459 additions and 326 deletions.
diff --git a/MANIFEST b/MANIFEST
@@ -1,5 +1,6 @@
 LICENSE
 MANIFEST
+MANIFEST.SKIP
 Makefile.PL
 README
 WHATSNEW
@@ -114,6 +115,60 @@ dist/compat/help
 dist/compat/random_rotate
 dist/error.log
 dist/etc/.empty
+dist/lib/MiniMate/CfgMgr.pm
+dist/lib/MiniMate/LIESMICH
+dist/lib/MiniMate/README
+dist/lib/MiniMate/locales/de_DE.cfg
+dist/lib/MiniMate/locales/fr_FR.cfg
+dist/lib/MiniMate/locales/it_IT.cfg
+dist/lib/MiniMate/locales/pt_BR.cfg
+dist/lib/MiniMate/locales/ru_RU.cfg
+dist/lib/MiniMate/minimate.cfg
+dist/lib/MiniMate/mmtags.cfg
+dist/lib/MiniMate/pages/config/add_field.html
+dist/lib/MiniMate/pages/config/catalog.cfg.html
+dist/lib/MiniMate/pages/config/db_column.html
+dist/lib/MiniMate/pages/config/db_configure.html
+dist/lib/MiniMate/pages/config/db_export.html
+dist/lib/MiniMate/pages/config/db_journal.html
+dist/lib/MiniMate/pages/config/db_limit.html
+dist/lib/MiniMate/pages/config/db_upload.html
+dist/lib/MiniMate/pages/config/dbedit.html
+dist/lib/MiniMate/pages/config/delete_field.html
+dist/lib/MiniMate/pages/config/directive.html
+dist/lib/MiniMate/pages/config/do_download.html
+dist/lib/MiniMate/pages/config/do_upload.html
+dist/lib/MiniMate/pages/config/do_upload_page.html
+dist/lib/MiniMate/pages/config/do_view.html
+dist/lib/MiniMate/pages/config/edit_record.html
+dist/lib/MiniMate/pages/config/edit_record_arg.html
+dist/lib/MiniMate/pages/config/export.html
+dist/lib/MiniMate/pages/config/fmenu.html
+dist/lib/MiniMate/pages/config/format_meta.html
+dist/lib/MiniMate/pages/config/fr_list.html
+dist/lib/MiniMate/pages/config/fr_menu.html
+dist/lib/MiniMate/pages/config/fr_select.html
+dist/lib/MiniMate/pages/config/getfile.html
+dist/lib/MiniMate/pages/config/key_violation.html
+dist/lib/MiniMate/pages/config/last_search.html
+dist/lib/MiniMate/pages/config/login.html
+dist/lib/MiniMate/pages/config/menu.html
+dist/lib/MiniMate/pages/config/noframe.html
+dist/lib/MiniMate/pages/config/nothing.html
+dist/lib/MiniMate/pages/config/reconfig.html
+dist/lib/MiniMate/pages/config/report.html
+dist/lib/MiniMate/pages/config/report_results.html
+dist/lib/MiniMate/pages/config/save_report.html
+dist/lib/MiniMate/pages/config/seefile.html
+dist/lib/MiniMate/pages/config/setup_acl.html
+dist/lib/MiniMate/pages/config/spread.html
+dist/lib/MiniMate/pages/config/spread_results.html
+dist/lib/MiniMate/pages/config/table_violation.html
+dist/lib/MiniMate/pages/config/upload_config.html
+dist/lib/MiniMate/pages/config/upload_other.html
+dist/lib/MiniMate/pages/config/upload_pages.html
+dist/lib/MiniMate/pages/config/violation.html
+dist/lib/MiniMate/pages/special/naughty.html
 dist/locale.error
 dist/minivend.cfg.dist
 dist/simple/catalog.cfg
@@ -227,7 +282,6 @@ dist/simple/pages/config/report_def/Orders%20by%20SKU.html
 dist/simple/pages/config/report_def/Orders%20by%20amount.html
 dist/simple/pages/config/report_def/Products%20by%20category.html
 dist/simple/pages/config/report_def/Products%20to%20edit.html
-dist/simple/pages/config/reports/.html
 dist/simple/pages/config/reports/Orders%20by%20SKU%20-%20Short.html
 dist/simple/pages/config/reports/Orders%20by%20SKU.html
 dist/simple/pages/config/reports/Orders%20by%20amount.html
@@ -348,9 +402,11 @@ dist/usertag/reconfig_wait
 dist/usertag/summary
 dist/usertag/title_bar
 dist/usertag/var
+dist/usertag/xml_generator
 eg/check
 eg/checkstat.sh
 eg/compact
+eg/globalsub/signio
 eg/ifdef
 extra/Business/UPS.pm
 extra/File/CounterFile.pm

diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
@@ -0,0 +1,46 @@
+(^|/)_.*
+.*/session/[^.].*
+.*/session\..*
+.*/tmp/[^.].*
+.*\.bak$
+.*\.gz$
+.*,v$
+.*\.swp$
+.*\.old
+.*\.zip$
+.*_$
+.*~$
+^_.*
+^.cvs*
+.*/\.cvs*
+MANIFEST\.bak
+Makefile$
+Makefile.old$
+\.linux.warned
+\bRCS\b
+\bCVS\b
+^test/.*
+bin/.*
+blib/.*
+catalogs/[^.].*
+control/.*
+scripts/initp.PL
+scripts/.*[a-z]$
+configure.in$
+custom/.*
+dev/.*
+doc/.*[^d]
+^lib/Business.*
+^lib/File.*
+^lib/HTML.*
+^lib/URI.*
+^lib/IniConf.pm
+dist/etc/[^.].*
+run/.*
+windows/*
+work/.*
+lib/src/config.cache
+lib/src/config.h
+lib/src/config.log
+lib/src/config.status
+lib/src/syscfg
diff --git a/Makefile.PL b/Makefile.PL
@@ -26,7 +26,7 @@ my $Prompt_sub;
 my @mods_to_get;
 my $Lock_troubles;
 
-$VERSION = '4.02';
+$VERSION = '4.03';
 
 # See if we have the CPAN module
 my $Cpan = 0;
@@ -334,8 +334,16 @@ sub initialize {
 			if ! $MV::Default{INSTALLMAN3DIR};
 	}
 
+	if (! -f 'pod/mvtags.pod') {
+		chdir 'lib'
+			or die "Cannot chdir to ./lib: $!\n";
+		system("$^X Vend/Tagref.pm > ../pod/mvtags.pod");
+		chdir '..'
+			or die "Cannot chdir back to ..: $!\n";
+	}
 	my @re_dir  = qw( simple/download );
 	my @re_copy = qw(	
+						../pod/mvtags.pod simple/download/mvtags.pod
 						../pod/mvdocs.pod simple/download/mvdocs.pod
 						../pod/mvfaq.pod simple/download/mvfaq.pod
 						);
@@ -381,15 +389,6 @@ sub initialize {
 			}
 		}
 		chdir '..';
-		my (@minimate) = sort grep -d $_, glob '../MiniMate-4*';
-		my $minimate = pop @minimate;
-		if( $minimate and ! $ENV{RPM_BUILD_ROOT} ) {
-			my $dir = $realdir;
-			$dir = "$X{RPMBUILDDIR}/$dir"
-				if $X{RPMBUILDDIR};
-			chdir $minimate;
-			system "$^X install $dir 1"
-		}
 		exit;
 	}
 
@@ -513,6 +512,7 @@ EOF
 
 	MODGET: {
 		last MODGET unless $Cpan;
+		my $odir = cwd();
 		unless (-d 'build') {
 			mkdir('build', 0777)
 				or die "Couldn't make build directory for CPAN: $!\n";
@@ -530,7 +530,8 @@ EOF
 				print "\a\n$mod get failed.\n\n";
 			}
 		}
-		chdir '..';
+		chdir $odir
+			or die "Couldn't return to original dir $odir: $!\n";
 	}
 
 	$Data::Dumper::Terse = 1;
@@ -562,6 +563,8 @@ sub MY::install {
 	}
 
 	my $new = <<'EOF';
+VERBINST=0
+
 mv_install ::
 			$(PERL) Makefile.PL force final=$(INSTALLARCHLIB)
 
@@ -623,10 +626,14 @@ EOF
 
 WriteMakefile(
 	NAME       => "MiniVend",
-	MAN3PODS => { 'pod/mvdocs.pod' => 'blib/man3/mvdocs.8' },
+	MAN3PODS => {
+					'pod/mvdocs.pod' => 'blib/man3/mvdocs.8',
+					'pod/mvtags.pod' => 'blib/man3/mvtags.8',
+					'pod/mvfaq.pod' => 'blib/man3/mvfaq.8',
+					},
 	DISTNAME => "minivend",
 	clean    => {
-	            FILES=> "lib/IniConf.pm _uid _db_storable _session_storable lib/File/CounterFile.pm scripts/initp.pl scripts/compile_link scripts/config_prog scripts/configdump scripts/dump scripts/expire scripts/localize scripts/expireall scripts/makecat scripts/minivend scripts/offline scripts/restart scripts/update dist/simple/download/mvdocs.pod dist/simple/download/mvfaq.pod",
+	            FILES=> "lib/IniConf.pm _uid _db_storable _session_storable lib/File/CounterFile.pm scripts/initp.pl scripts/compile_link scripts/config_prog scripts/configdump scripts/dump scripts/expire scripts/localize scripts/expireall scripts/makecat scripts/minivend scripts/offline scripts/restart scripts/update dist/simple/download/mvdocs.pod dist/simple/download/mvtags.pod dist/simple/download/mvfaq.pod pod/mvtags.pod",
 	           },
 
 	dist     => {

diff --git a/README b/README
@@ -52,11 +52,12 @@ Major files/directories in the distribution:
                 files and modules. Includes:
 
                 minivend.cfg.dist   Distribution minivend.cfg
-                checkout/           Checkout-only demo application.
+                basic/              The basic MV catalog demo application.
                 simple/             The not so aptly named "simple" demo
                                     application.
                 src/                C and Perl code for CGI links
                 compat/             Some Minivend-3 compatibility tags
+                lib/                Minimate
                 usertag/            Some fairly-standard usertags
 
     extra/      Some not-always-needed Perl libraries.
@@ -97,7 +98,8 @@ Major files/directories in the distribution:
          sufficient memory
        * Cookie support allows browsers to leave catalog and come
          back without losing session state
-       * Minimate web administration interface (separate package)
+       * Minimate web administration interface allows complete
+         database editing
        * Complete user authentication and database with address
          books and stored shopping carts
        * Many, many, other features

diff --git a/WHATSNEW b/WHATSNEW
@@ -1,3 +1,35 @@
+Minivend-4.03 changes:
+* MiniMate now a part of Minivend
+* Fixed partial update problems with SQL databases
+* Fixed [time ...] tag.
+* Fixed OnFly ordering problem (Parse.pm).
+* Fixed initp.PL problem when using CPAN module installer (thanks to Jim Balster)
+* Added [if errors] You have errors. [/if]
+* Added tag reference to distribution -- it was there in Tagref.pm but
+  now we build it
+* Added ability to not update order counter in Order.pm -- if
+  Vend::Session->{mv_order_number} is used
+* fix [checked ...] tag to work and set default only if empty
+* fixed [timed-build] to work with $Vend::Session->{frames}
+* fixed _ca_postcode and _zip to actually work.
+* fixed $::Session reference (thanks Bill Randle!)
+* changed uneval to uneval_it in UserDB for more compact storage
+  with no <CR>
+* added keep=1 parameter in set_hash to allow sort of a merge
+* fixed expire to work better with file-based sesssions
+* Makecat:
+    -- fixed endless loop problem with --nocopy and bad directory spec
+    -- added ~ processing to the appropriate directories.
+* Racke updated distribution so it works better with CVS
+* Fixed etc/log_transaction so auto-user updates are made, now allows
+  you to keep track of customers
+* Documentation update to Minimate (recommended modules)
+* Frames fixes for Minimate
+* Stefan fixed compile_link to work with relocation (debian pkg build)
+* Jim Balster helped me find a race condition in SessionFile.pm, fixed
+* Added ability to set DEFAULT_TYPE for SQL type, replaces former hard-coded
+  default of char(128)
+* Added history-scan tag
 
 Minivend-4.02 changes:
 

diff --git a/dist/basic/etc/log_transaction b/dist/basic/etc/log_transaction
@@ -20,12 +20,6 @@
 
 [try]
 [comment][perl] Log("Past ACL create log."); [/perl][/comment]
-[if scratch auto_create]
-	[userdb logout]
-	[value name=mv_username set=""]
-[/if]
-[comment][perl] Log("Past add data entry."); [/perl][/comment]
-
 Add main order[data
 	table=userdb
 	column=order_numbers
@@ -87,7 +81,13 @@ order_date: [value order_date]
 status: pending
 [/import]
 [/item-list][/try]
-[catch] There was an error. [/catch]
+[catch] There was an error adding to the transaction log. [/catch]
+[if scratch auto_create]
+	[userdb logout]
+	[value name=mv_username set=""]
+[/if]
+[comment][perl] Log("Past add data entry."); [/perl][/comment]
+
 [comment][perl] Log("Past all transaction log."); [/perl][/comment]
 [/seti][perl]
 	my $out = $Scratch->{transaction_record};

diff --git a/dist/basic/products/minimate.asc b/dist/basic/products/minimate.asc
@@ -1,4 +1,4 @@
-username	super	yes_tables	no_tables	upload	acl	export	edit	pages	files	config	reconfig	meta	no_functions	table_control
-test	0		2ndDayAir Ground NextDayAir locale minimate mv_metadata	inventory pricing products	cat pricing products	inventory orderline pricing products		ind* news* about* privacy*	error.log etc/*	0	1	products	files change_db spreadsheet display_configure entities error config home search sql	{'pricing' => {'no_fields' => "price_group",},'products' => {'no_keys' => "00-342",'no_fields' => "weight nontaxable",'yes_keys' => "00-0011 00-0011a 00-342 00-343 00-404",'yes_fields' => "sku artist title description comment price",},}
-shipping	0	orderline transactions			orderline transactions			NONE	etc/tracking.asc orders/*	0	0	orderline transactions	pages add_field journal_update display_configure entities error config home sql	{'transactions' => {'yes_fields' => "code status",},'orderline' => {'yes_fields' => "code status",},}
+username	super	yes_tables	no_tables	upload	acl	export	edit	pages	files	config	reconfig	meta	no_functions	yes_functions	table_control
+test	0		2ndDayAir Ground NextDayAir locale minimate mv_metadata	inventory pricing products	cat pricing products	inventory orderline pricing products		ind* news* about* privacy*	error.log etc/*	0	1	products	files change_db spreadsheet display_configure entities error config home search	report	{'pricing' => {'no_fields' => "price_group",},'products' => {'no_keys' => "00-342",'no_fields' => "weight nontaxable",'yes_keys' => "00-0011 00-0011a 00-342 00-343 00-404",'yes_fields' => "sku artist title description comment price",},}
+shipping	0	orderline transactions			orderline transactions			NONE	etc/tracking.asc orders/*	0	0	orderline transactions	pages add_field journal_update display_configure entities error config home sql	none	{'transactions' => {'yes_fields' => "code status",},'orderline' => {'yes_fields' => "code status",},}
 __MVC_SUPERUSER__	1				products					0	1