Skip to content
Permalink
Browse files

Make more room for different conflict types.

  • Loading branch information
kohler committed May 24, 2019
1 parent c7fa0c1 commit cb59aa5e914e8209940431a9555f3cb186bc66bd
Showing with 10 additions and 7 deletions.
  1. +1 −1 devel/ballotranks.pl
  2. +1 −1 devel/ranktest.pl
  3. +1 −1 devel/ranktest2.pl
  4. +1 −1 src/conference.php
  5. +2 −2 src/init.php
  6. +1 −1 src/schema.sql
  7. +3 −0 src/updateschema.php
@@ -44,7 +44,7 @@
$papers[$p] = 1;
print "insert into Paper (paperId, title, authorInformation, abstract, timeSubmitted) values ($p, '$n', 'Jane\\tAuthor$p\\tauthor$p\@_.com\\t\\n', 'This is Paper $p', $now) on duplicate key update abstract=abstract;\n";
print "insert into ContactInfo (firstName, lastName, email, password) values ('Jane', 'Author$p', 'author$p\@_.com', 'x') on duplicate key update password=password;\n";
print "insert into PaperConflict (paperId, contactId, conflictType) values ($p, (select contactId from ContactInfo where email='author$p\@_.com'), 10) on duplicate key update conflictType=conflictType;\n";
print "insert into PaperConflict (paperId, contactId, conflictType) values ($p, (select contactId from ContactInfo where email='author$p\@_.com'), 65) on duplicate key update conflictType=conflictType;\n";
}

my($voternum) = @papers + 1;
@@ -37,7 +37,7 @@
my($p, $t, $n) = split;
print "insert into Paper (paperId, title, authorInformation, abstract, timeSubmitted) values ($p, 'Paper $p', 'Jane\\tAuthor$p\\tauthor$p\@_.com\\t\\n', 'This is Paper $p', $now) on duplicate key update abstract=abstract;\n";
print "insert into ContactInfo (firstName, lastName, email, password) values ('Jane', 'Author$p', 'author$p\@_.com', 'x') on duplicate key update password=password;\n";
print "insert into PaperConflict (paperId, contactId, conflictType) values ($p, (select contactId from ContactInfo where email='author$p\@_.com'), 10) on duplicate key update conflictType=conflictType;\n";
print "insert into PaperConflict (paperId, contactId, conflictType) values ($p, (select contactId from ContactInfo where email='author$p\@_.com'), 65) on duplicate key update conflictType=conflictType;\n";
print "insert into PaperTag (paperId, tag, tagIndex) values ($p, '$t', $n) on duplicate key update tagIndex=$n;\n";
}

@@ -43,7 +43,7 @@
$papers[$p] = 1;
print "insert into Paper (paperId, title, authorInformation, abstract, timeSubmitted) values ($p, '$n', 'Jane\\tAuthor$p\\tauthor$p\@_.com\\t\\n', 'This is Paper $p', $now) on duplicate key update abstract=abstract;\n";
print "insert into ContactInfo (firstName, lastName, email, password) values ('Jane', 'Author$p', 'author$p\@_.com', 'x') on duplicate key update password=password;\n";
print "insert into PaperConflict (paperId, contactId, conflictType) values ($p, (select contactId from ContactInfo where email='author$p\@_.com'), 10) on duplicate key update conflictType=conflictType;\n";
print "insert into PaperConflict (paperId, contactId, conflictType) values ($p, (select contactId from ContactInfo where email='author$p\@_.com'), 65) on duplicate key update conflictType=conflictType;\n";
}

my($voternum) = @papers + 1;
@@ -241,7 +241,7 @@ function load_settings() {

// update schema
$this->sversion = $this->settings["allowPaperOption"];
if ($this->sversion < 212) {
if ($this->sversion < 213) {
require_once("updateschema.php");
$old_nerrors = Dbl::$nerrors;
updateSchema($this);
@@ -18,8 +18,8 @@
define("CONFLICT_AUTHORMARK", 2);
define("CONFLICT_MAXAUTHORMARK", 7);
define("CONFLICT_CHAIRMARK", 8);
define("CONFLICT_AUTHOR", 9);
define("CONFLICT_CONTACTAUTHOR", 10);
define("CONFLICT_AUTHOR", 64);
define("CONFLICT_CONTACTAUTHOR", 65);

define("REV_RATINGS_PC", 0);
define("REV_RATINGS_PC_EXTERNAL", 1);
@@ -510,7 +510,7 @@ CREATE TABLE `TopicInterest` (



insert into Settings (name, value) values ('allowPaperOption', 212);
insert into Settings (name, value) values ('allowPaperOption', 213);
insert into Settings (name, value) values ('setupPhase', 1);
-- there are no submissions yet
insert into Settings (name, value) values ('no_papersub', 1);
@@ -1508,6 +1508,9 @@ function updateSchema($conf) {
$conf->ql("update Settings set name='msg.resp_instrux_0' where name='msg.resp_instrux'");
$conf->update_schema_version(212);
}
if ($conf->sversion == 212
&& $conf->ql("update PaperConflict set conflictType=(64 + conflictType - 9) where conflictType>=9 and conflictType<64"))
$conf->update_schema_version(213);

$conf->ql("delete from Settings where name='__schema_lock'");
Conf::$g = $old_conf_g;

0 comments on commit cb59aa5

Please sign in to comment.
You can’t perform that action at this time.