ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/UserCode/OSUT3Analysis/DBTools/scripts/osudb

Comparing UserCode/OSUT3Analysis/DBTools/scripts/osudb (file contents):
Revision 1.13 by ahart, Mon Oct 22 13:50:25 2012 UTC vs.
Revision 1.27 by ahart, Thu Jun 20 00:49:02 2013 UTC

#	Line 4 | Line 4 | use strict;
4		use Mysql;
5		use Getopt::Long;
6		use File::Copy;
7	+	use Term::ANSIColor;
8
9		sub getDataset;
10		sub dbUpdate;
#	Line 14 | Line 15 | sub addSlashes;
15		sub uploadRelease;
16		sub downloadRelease;
17		sub datasetExists;
18	+	sub uploadConfig;
19	+	sub locationExists;
20	+	sub getLocation;
21
22		our $db = Mysql->connect ("cmshead.mps.ohio-state.edu", "ntuple", "osuT3User") or die "Failed to connect to Tier 3, stopped";
23
24		my %opt;
25		Getopt::Long::Configure ("bundling");
26	<	GetOptions (\%opt, "comment|c=s", "format|f=s", "pyConfig|p=s", "crabCfg|b=s", "jsonFile|j=s", "lumiSummary|s=s", "location|l=s", "fileList|t=s", "release|r=s", "other|o", "recipe|e=s", "help|h");
26	>	GetOptions (\%opt, "comment|c=s", "format|f=s", "pyConfig|p=s", "crabCfg|b=s", "jsonFile|j=s", "lumiSummary|s=s", "location|l=s", "name|n=s", "fileList|t=s", "release|r=s", "other|o", "recipe|e=s", "globalTag|g=s", "configName|i=s", "xSection|x=s", "higherOrderXSec|y=s", "help|h");
27		my $argc = @ARGV;
28
29		printHelp ($ARGV[0]) if $opt{"help"};
30		printHelp () if $argc != 2 && $ARGV[0] ne "createOther";
31	<	printHelp () if $ARGV[0] ne "create" && $ARGV[0] ne "createOther" && $ARGV[0] ne "update" && $ARGV[0] ne "finish" && $ARGV[0] ne "deprecate" && $ARGV[0] ne "uploadRelease" && $ARGV[0] ne "downloadRelease" && $ARGV[0] ne "deleteEntry";
31	>	printHelp () if $ARGV[0] ne "create" && $ARGV[0] ne "createOther" && $ARGV[0] ne "update" && $ARGV[0] ne "finish" && $ARGV[0] ne "deprecate" && $ARGV[0] ne "uploadRelease" && $ARGV[0] ne "downloadRelease" && $ARGV[0] ne "deleteEntry" && $ARGV[0] ne "uploadConfig";
32		if (($ARGV[0] eq "create" || $ARGV[0] eq "finish") && !$opt{"location"})
33		{
34		print "The directory containing the ntuples must be given!\n";
#	Line 35 | Line 39 | if ($ARGV[0] eq "uploadRelease" && (!$op
39		print "The Python config, CMSSW release directory, and recipe file must be given!\n";
40		exit;
41		}
42	+	if ($ARGV[0] eq "uploadConfig" && (!$opt{"pyConfig"} || !$opt{"release"}))
43	+	{
44	+	print "The Python config and ntuple release must be given!\n";
45	+	exit;
46	+	}
47		if ($ARGV[0] eq "uploadRelease")
48		{
49		my $parentDir = "./$opt{'release'}";
#	Line 50 | Line 59 | elsif ($ARGV[0] eq "downloadRelease")
59		{
60		downloadRelease ($ARGV[1], $opt{"pyConfig"});
61		}
62	+	elsif ($ARGV[0] eq "uploadConfig")
63	+	{
64	+	uploadConfig ($ARGV[1], $ENV{"USER"}, $opt{"pyConfig"}, $opt{"release"}, $opt{"comment"});
65	+	}
66		elsif ($ARGV[0] eq "createOther")
67		{
68		my @listOfFiles = @ARGV;
69		@listOfFiles = reverse (@listOfFiles);
70		pop (@listOfFiles);
71		@listOfFiles = reverse (@listOfFiles);
72	<	dbOtherCreate ("$ENV{'USER'}", \@listOfFiles, $opt{"comment"});
72	>	dbOtherCreate ("$ENV{'USER'}\@$ENV{'HOSTNAME'}", \@listOfFiles, $opt{"comment"});
73		}
74		else
75		{
#	Line 70 | Line 83 | else
83		$status = "" if $ARGV[0] eq "update";
84		$status = "deprecated" if $ARGV[0] eq "deprecate";
85		$opt{"format"} = "BEAN" if $ARGV[0] eq "create" && !$opt{"format"};
86	<	dbUpdate ($id, $fullDataset, "$ENV{'USER'}\@$ENV{'HOSTNAME'}", $opt{"format"}, $opt{"location"}, $opt{"fileList"}, $status, $opt{"comment"}, $opt{"pyConfig"}, $opt{"crabCfg"}, $opt{"jsonFile"}, $opt{"lumiSummary"}, $opt{"release"}) if !$opt{"other"};
87	<	dbUpdateOther ($id, $opt{"comment"}, "$ENV{'USER'}\@$ENV{'HOSTNAME'}") if $opt{"other"};
86	>	if ($opt{"location"} && locationExists ($id, $opt{"location"}))
87	>	{
88	>	print "This location is already registered in the database!\n";
89	>	exit;
90	>	}
91	>	dbUpdate ($id, $fullDataset, "$ENV{'USER'}\@$ENV{'HOSTNAME'}", $opt{"format"}, $opt{"location"}, $opt{"name"}, $opt{"fileList"}, $status, $opt{"comment"}, $opt{"pyConfig"}, $opt{"crabCfg"}, $opt{"jsonFile"}, $opt{"lumiSummary"}, $opt{"release"}, $opt{"globalTag"}, $opt{"configName"}, $opt{"xSection"}, $opt{"higherOrderXSec"}) if $ARGV[0] ne "deleteEntry" && !$opt{"other"};
92	>	dbUpdateOther ($id, $opt{"comment"}, "$ENV{'USER'}\@$ENV{'HOSTNAME'}") if $ARGV[0] ne "deleteEntry" && $opt{"other"};
93		dbDelete ($id) if $ARGV[0] eq "deleteEntry" && !$opt{"other"};
94		dbDeleteOther ($id) if $ARGV[0] eq "deleteEntry" && $opt{"other"};
95		}
#	Line 99 | Line 117 | getDataset
117		my $queryDataset = $dataset;
118		$queryDataset =~ s/\*/%/g;
119		$queryDataset =~ s/(.*)/%$1%/g;
120	<	my $query = "select id,dataset,user,creationTime from ntuple where dataset like '$queryDataset' order by creationTime";
120	>	my $query = "select id,dataset,user,creationTime,status from ntuple where dataset like '$queryDataset' order by creationTime";
121		$db->selectdb ("ntuple");
122		$results = $db->query ($query);
123		if ($results->numrows () == 1)
#	Line 132 | Line 150 | getDataset
150		for (my $i = 1; $i <= $results->numrows (); $i++)
151		{
152		my @row = $results->fetchrow ();
153	+	$row[3] =~ s/([^ ]*) [^ ]*/$1/g;
154		$id{"$i"} = $row[0];
155		$fullDataset{"$i"} = $row[1];
156		printf "(%2d) $row[1]\n", $i;
157	<	print "     created by $row[2] on $row[3]\n";
157	>	print "     (";
158	>	print color "green" if $row[4] eq "present";
159	>	print color "bold yellow" if $row[4] eq "submitted";
160	>	print color "bold red" if $row[4] eq "created" or $row[4] eq "cancelled" or $row[4] eq "deprecated";
161	>	print $row[4];
162	>	print color "reset";
163	>	print ") created by $row[2] on $row[3]\n";
164		}
165		print "\nWhich entry would you like to modify?";
166		if ($command ne "deleteEntry" && $command ne "deprecate")
#	Line 163 | Line 188 | dbUpdate
188		{
189		my $id = shift;
190		my $dataset = shift;
191	<	my $user = shift;
191	>	my $userAndHost = shift;
192		my $format = shift;
193		my $location = shift;
194	+	my $name = shift;
195		my $fileListName = shift;
196		my $status = shift;
197		my $comment = shift;
#	Line 174 | Line 200 | dbUpdate
200		my $jsonFileName = shift;
201		my $lumiSummaryName = shift;
202		my $release = shift;
203	+	my $globalTag = shift;
204	+	my $configName = shift;
205	+	my $xSection = shift;
206	+	my $ySection = shift;
207	+
208	+	$location = getLocation ($id) if $id > 0
209	+	&& !$crabCfgName
210	+	&& !$comment
211	+	&& !$format
212	+	&& !$globalTag
213	+	&& !$configName
214	+	&& !$jsonFileName
215	+	&& !$location
216	+	&& !$name
217	+	&& !$psetName
218	+	&& !$release
219	+	&& !$lumiSummaryName
220	+	&& !$xSection
221	+	&& !$ySection;
222	+
223	+	my $user = $userAndHost;
224	+	$user =~ s/@.*$//g;
225
226		my $fileList;
227		my $pset;
#	Line 242 | Line 290 | dbUpdate
290		close (LUMI_SUMMARY);
291		$lumiSummary = join ("", @lumiSummary);
292		}
293	<	if ($release)
294	<	{
247	<	my $query = "select id from ntupleRelease where name='$release'";
248	<	$db->selectdb ("ntuple");
249	<	my $results = $db->query ($query);
250	<	if ($results->numrows () != 1)
251	<	{
252	<	print "Ntuple release \"$release\" not found!\n";
253	<	exit;
254	<	}
255	<	}
256	<	($nFiles, $size) = sizeOfDataset ($dataset, $location, $fileList);
293	>	$release .= ".$configName" if $configName;
294	>	($nFiles, $size) = sizeOfDataset ($location, $fileList);
295		my $fullLocation = $location;
296		$fullLocation = "$ENV{'PWD'}/$location" if !($location =~ m/^\//);
297
#	Line 265 | Line 303 | dbUpdate
303		$jsonFile = addSlashes ($jsonFile);
304		$lumiSummary = addSlashes ($lumiSummary);
305		$fullLocation = addSlashes ($fullLocation);
306	+	$name = addSlashes ($name);
307		$fileList = addSlashes ($fileList);
308		$status = addSlashes ($status);
309		$comment = addSlashes ($comment);
310		$release = addSlashes ($release);
311	+	$globalTag = addSlashes ($globalTag);
312
313		my $results;
314		my $query;
315		if ($id < 0)
316		{
317	+	$query = "select id from ntuple where dataset='$dataset'";
318	+	$db->selectdb ("ntuple");
319	+	$results = $db->query ($query);
320	+	if ($results->numrows ())
321	+	{
322	+	print "This dataset already exists in the database. Create anyway? (y/N): ";
323	+	my $response = <STDIN>;
324	+	$response =~ s/\n//g;
325	+	$response = "n" if !$response;
326	+	exit if substr (lc ($response), 0, 1) ne 'y';
327	+	}
328	+
329		$query = "select max(id) from ntuple";
330		$db->selectdb ("ntuple");
331		$results = $db->query ($query);
#	Line 281 | Line 333 | dbUpdate
333		my $id = 1;
334		$id = $row[0] + 1 if $results->numrows ();
335
336	<	$query = "insert into ntuple (id, dataset, creationTime, lastUpdateTime, lastUpdateUser, user, format, location, fileList, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile, lumiSummary, version) values ($id, '$dataset', now(), now(), '$user', '$user', '$format', '$fullLocation', '$fileList', $nFiles, $size, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile', '$lumiSummary', '$release')";
336	>	my $columns = "(id, dataset, creationTime, lastUpdateTime, lastUpdateUser, user, format, location, fileList, nFiles, sizeInGB, status, comment, pset, crabCfg, jsonFile, lumiSummary, version, globalTag";
337	>	$columns .= ", crossSectionInPicobarn" if $xSection;
338	>	$columns .= ", higherOrderCrossSectionInPicobarn" if $ySection;
339	>	$columns .= ")";
340	>	my $values = "($id, '$dataset', now(), now(), '$userAndHost', '$user', '$format', '$fullLocation', '$fileList', $nFiles, $size, '$status', '$comment', '$pset', '$crabCfg', '$jsonFile', '$lumiSummary', '$release', '$globalTag'";
341	>	$values .= ", $xSection" if $xSection;
342	>	$values .= ", $ySection" if $ySection;
343	>	$values .= ")";
344	>	$query = "insert into ntuple $columns values $values";
345		}
346		if ($id > 0)
347		{
348		my $fields;
349		my $values;
350
351	<	$values .= ", dataset='$dataset'" if $dataset;
351	>	if ($name)
352	>	{
353	>	$query = "select id from ntuple where dataset='$name'";
354	>	$db->selectdb ("ntuple");
355	>	$results = $db->query ($query);
356	>	if ($results->numrows ())
357	>	{
358	>	print "This dataset already exists in the database. Use this name anyway? (y/N): ";
359	>	my $response = <STDIN>;
360	>	$response =~ s/\n//g;
361	>	$response = "n" if !$response;
362	>	exit if substr (lc ($response), 0, 1) ne 'y';
363	>	}
364	>	$values .= ", dataset='$name'";
365	>	}
366	>
367		$values .= ", lastUpdateTime=now()";
368		$values .= ", lastUpdateUser='$user'";
369		$values .= ", format='$format'" if $format;
#	Line 303 | Line 378 | dbUpdate
378		$values .= ", jsonFile='$jsonFile'" if $jsonFile;
379		$values .= ", lumiSummary='$lumiSummary'" if $lumiSummary;
380		$values .= ", version='$release'" if $release;
381	+	$values .= ", globalTag='$globalTag'" if $globalTag;
382	+	$values .= ", crossSectionInPicobarn=$xSection" if $xSection;
383	+	$values .= ", higherOrderCrossSectionInPicobarn=$ySection" if $ySection;
384
385		$values =~ s/^, //;
386		$query = "update ntuple set $values where id=$id";
#	Line 366 | Line 444 | printHelp
444		printf "%-29s%s\n", "  -b, --crabCfg FILE", "CRAB config used to submit ntuple jobs";
445		printf "%-29s%s\n", "  -c, --comment COMMENT", "comment for the database entry";
446		printf "%-29s%s\n", "  -f, --format FORMAT", "ntuple format (default: BEAN)";
447	+	printf "%-29s%s\n", "  -g, --globalTag TAG", "global tag";
448	+	printf "%-29s%s\n", "  -i, --configName NAME", "name of config used to produce ntuples";
449		printf "%-29s%s\n", "  -j, --jsonFile FILE", "JSON file used for this dataset";
450		printf "%-29s%s\n", "  -l, --location DIRECTORY", "directory containing the ntuples";
451		printf "%-29s%s\n", "  -p, --pyConfig FILE", "Python config used to produce ntuples";
452		printf "%-29s%s\n", "  -r, --release NAME", "ntuple release used to produce ntuples";
453		printf "%-29s%s\n", "  -s, --lumiSummary FILE", "lumiSummary.json reported by CRAB";
454	+	printf "%-29s%s\n", "  -x, --xSection XSEC", "cross section in picobarns from PREP";
455	+	printf "%-29s%s\n", "  -y, --higherOrderXSec XSEC", "higher-order cross section in picobarns";
456		}
457		elsif ($command eq "createOther")
458		{
#	Line 383 | Line 465 | printHelp
465		elsif ($command eq "update")
466		{
467		print "Usage: $exeName [OPTION]... update NAME\n";
468	<	print "Updates an existing database entry for dataset NAME.\n";
468	>	print "Updates an existing database entry for dataset NAME. If no options are given,\n";
469	>	print "updates the number of files and the size on disk of the dataset using the\n";
470	>	print "location in the database.\n";
471		print "\n";
472		print "Mandatory arguments to long options are mandatory for short options too.\n";
473		printf "%-29s%s\n", "  -b, --crabCfg FILE", "CRAB config used to submit ntuple jobs";
474		printf "%-29s%s\n", "  -c, --comment COMMENT", "comment for the database entry";
475		printf "%-29s%s\n", "  -f, --format FORMAT", "ntuple format";
476	+	printf "%-29s%s\n", "  -g, --globalTag TAG", "global tag";
477	+	printf "%-29s%s\n", "  -i, --configName NAME", "name of config used to produce ntuples";
478		printf "%-29s%s\n", "  -j, --jsonFile FILE", "JSON file used for this dataset";
479		printf "%-29s%s\n", "  -l, --location DIRECTORY", "directory containing the ntuples";
480	+	printf "%-29s%s\n", "  -n, --name NAME", "rename the entry";
481		printf "%-29s%s\n", "  -o, --other", "update an entry in the non-ntuple database";
482		printf "%-29s%s\n", "  -p, --pyConfig FILE", "Python config used to produce ntuples";
483		printf "%-29s%s\n", "  -r, --release NAME", "ntuple release used to produce ntuples";
484		printf "%-29s%s\n", "  -s, --lumiSummary FILE", "lumiSummary.json reported by CRAB";
485	+	printf "%-29s%s\n", "  -x, --xSection XSEC", "cross section in picobarns from PREP";
486	+	printf "%-29s%s\n", "  -y, --higherOrderXSec XSEC", "higher-order cross section in picobarns";
487		}
488		elsif ($command eq "finish")
489		{
490		print "Usage: $exeName -l DIRECTORY finish NAME\n";
402	–
491		print "Finalizes the database entry for dataset NAME, changing its status to\n";
492		print "\"present\".  This is intended to be the final step in command-line based ntuple\n";
493		print "production.\n";
#	Line 447 | Line 535 | printHelp
535		print "Mandatory arguments to long options are mandatory for short options too.\n";
536		printf "%-29s%s\n", "  -p, --pyConfig FILE", "Python configuration file name";
537		}
538	+	elsif ($command eq "uploadConfig")
539	+	{
540	+	print "Usage: $exeName -p FILE -r RELEASE [OPTION]... uploadConfig NAME\n";
541	+	print "Creates an entry in the database for a customized Python configuration file.\n";
542	+	print "\n";
543	+	print "Mandatory arguments to long options are mandatory for short options too.\n";
544	+	printf "%-29s%s\n", "  -c, --comment COMMENT", "comment for the database entry";
545	+	printf "%-29s%s\n", "  -p, --pyConfig FILE", "Python config file";
546	+	printf "%-29s%s\n", "  -r, --release NAME", "ntuple release with which to use this config";
547	+	}
548		else
549		{
550		print "Usage: $exeName [OPTION]... COMMAND NAME\n";
#	Line 465 | Line 563 | printHelp
563		printf "%-29s%s\n", "  deprecate", "marks the dataset for deletion";
564		printf "%-29s%s\n", "  uploadRelease", "upload an ntuple release";
565		printf "%-29s%s\n", "  downloadRelease", "download an ntuple release";
566	+	printf "%-29s%s\n", "  uploadConfig", "upload an ntuple config";
567		}
568
569		exit;
#	Line 473 | Line 572 | printHelp
572		sub
573		sizeOfDataset
574		{
476	–	my $dataset = shift;
575		my $location = shift;
576		my $fileList = shift;
577
#	Line 530 | Line 628 | uploadRelease
628		print "$recipeName does not exist!\n";
629		exit;
630		}
631	<	move ($release, "/home/hart/public_html/releases/$name.tar.gz") or die "Ntuple releases may only be uploaded on the Tier 3, stopped";
631	>	move ($release, "/home/osucms/public_html/releases/$name.tar.gz") or die "Ntuple releases may only be uploaded on the Tier 3, stopped";
632		open (PY_CONFIG, "<$psetName");
633		my @pset = <PY_CONFIG>;
634		close (PY_CONFIG);
#	Line 538 | Line 636 | uploadRelease
636		open (RECIPE, "<$recipeName");
637		my @recipe = <RECIPE>;
638		close (RECIPE);
639	<	my $recipe = join ("\n", @recipe);
639	>	my $recipe = join ("", @recipe);
640
641		my $query = "select max(id) from ntupleRelease";
642		$db->selectdb ("ntuple");
#	Line 574 | Line 672 | downloadRelease
672		print "Ntuple release \"$release\" not found!\n";
673		exit;
674		}
577	–	if (!(-e "/home/hart/public_html/releases/$release.tar.gz"))
578	–	{
579	–	print "Release is in the database but no package exists!\n";
580	–	exit;
581	–	}
675		if ($pyConfigName)
676		{
677		my @row = $results->fetchrow ();
#	Line 586 | Line 679 | downloadRelease
679		print PY_CONFIG $row[1];
680		close (PY_CONFIG);
681		}
682	<	copy ("/home/hart/public_html/releases/$release.tar.gz", "$release.tar.gz");
682	>	`wget "http://cmshead.mps.ohio-state.edu/~osucms/releases/$release.tar.gz"`;
683		}
684
685		sub
686		dbOtherCreate
687		{
688	<	my $user = shift;
688	>	my $userAndHost = shift;
689		my $listOfFiles = shift;
690		my $comment = shift;
691
692	+	my $user = $userAndHost;
693	+	$user =~ s/@.*$//g;
694	+
695		my $size = 0.0;
696		my $nFiles = 0.0;
697		for (my $i = 0; $i < @$listOfFiles; $i++)
#	Line 626 | Line 722 | dbOtherCreate
722		$location = addSlashes ($location);
723		$comment = addSlashes ($comment);
724
725	<	my $query = "insert into other (id, creationTime, lastUpdateTime, lastUpdateUser, user, location, nFiles, sizeInGB, comment) values ($id, now(), now(), '$user', '$user', '$location', $nFiles, $size, '$comment')";
725	>	$query = "insert into other (id, creationTime, lastUpdateTime, lastUpdateUser, user, location, nFiles, sizeInGB, comment) values ($id, now(), now(), '$userAndHost', '$user', '$location', $nFiles, $size, '$comment')";
726		$db->selectdb ("ntuple");
727	<	my $results = $db->query ($query);
727	>	$results = $db->query ($query);
728
729		print "ID $id\n";
730		}
731	+
732	+	sub
733	+	uploadConfig
734	+	{
735	+	my $name = shift;
736	+	my $user = shift;
737	+	my $psetName = shift;
738	+	my $release = shift;
739	+	my $comment = shift;
740	+
741	+	if (!(-e $psetName))
742	+	{
743	+	print "$psetName does not exist!\n";
744	+	exit;
745	+	}
746	+	if ($release)
747	+	{
748	+	my $query = "select id from ntupleRelease where name='$release'";
749	+	$db->selectdb ("ntuple");
750	+	my $results = $db->query ($query);
751	+	if ($results->numrows () != 1)
752	+	{
753	+	print "Ntuple release \"$release\" not found!\n";
754	+	exit;
755	+	}
756	+	}
757	+	open (PSET, "<$psetName");
758	+	my @pset = <PSET>;
759	+	close (PSET);
760	+	my $pset = join ("", @pset);
761	+
762	+	my $query = "select max(id) from ntupleConfig";
763	+	$db->selectdb ("ntuple");
764	+	my $results = $db->query ($query);
765	+	my @row = $results->fetchrow ();
766	+	my $id = 1;
767	+	$id = $row[0] + 1 if $results->numrows ();
768	+
769	+	$name = addSlashes ($name);
770	+	$user = addSlashes ($user);
771	+	$pset = addSlashes ($pset);
772	+	$release = addSlashes ($release);
773	+	$comment = addSlashes ($comment);
774	+
775	+	my $query = "insert into ntupleConfig (id, name, pset, user, pending, ntupleRelease, comment) values ($id, '$name', '$pset', '$user', 1, '$release', '$comment')";
776	+	$db->selectdb ("ntuple");
777	+	$results = $db->query ($query);
778	+	}
779	+
780	+	sub
781	+	locationExists
782	+	{
783	+	my $id = shift;
784	+	my $location = shift;
785	+
786	+	$location =~ s/^(.*)\/+$/$1/;
787	+	my $query = "select id from ntuple where location like '$location%' and id!=$id";
788	+	$db->selectdb ("ntuple");
789	+	my $results = $db->query ($query);
790	+	return 1 if $results->numrows ();
791	+
792	+	if ($location =~ m/^\/store\/.*$/)
793	+	{
794	+	$location =~ s/^\/store\/(.*)$/\/data\/se\/store\/$1/;
795	+	}
796	+	elsif ($location =~ m/^\/data\/se\/store\/.*$/)
797	+	{
798	+	$location =~ s/^\/data\/se\/store\/(.*)$/\/store\/$1/;
799	+	}
800	+
801	+	my $query = "select id from ntuple where location like '$location%' and id!=$id";
802	+	$db->selectdb ("ntuple");
803	+	my $results = $db->query ($query);
804	+	return 1 if $results->numrows ();
805	+
806	+	return 0;
807	+	}
808	+
809	+	sub
810	+	getLocation
811	+	{
812	+	my $id = shift;
813	+
814	+	my $query = "select location from ntuple where id=$id";
815	+	$db->selectdb ("ntuple");
816	+	my $results = $db->query ($query);
817	+	my @row = $results->fetchrow ();
818	+
819	+	return $row[0];
820	+	}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines