renamed table columns id and studiensemester

This commit is contained in:
nkrondraf
2015-02-05 14:39:38 +01:00
parent 076e9eaea1
commit 87fb936dd5
3 changed files with 21 additions and 21 deletions
+10 -10
View File
@@ -25,8 +25,8 @@ class bisarchiv extends basis_db
public $result; public $result;
// Tabellenspalten // Tabellenspalten
public $id; public $archiv_id;
public $studiensemster; public $studiensemester_kurzbz;
public $meldung; public $meldung;
public $html; public $html;
public $studiengang_kz; public $studiengang_kz;
@@ -48,7 +48,7 @@ class bisarchiv extends basis_db
*/ */
protected function validate() protected function validate()
{ {
if($this->studiensemster == null || mb_strlen($this->studiensemster) > 6) if($this->studiensemster_kurzbz == null || mb_strlen($this->studiensemster_kurzbz) > 6)
{ {
$this->errormsg = "Studiensemester ist ungueltig"; $this->errormsg = "Studiensemester ist ungueltig";
return false; return false;
@@ -106,8 +106,8 @@ class bisarchiv extends basis_db
if(!$this->validate()) if(!$this->validate())
return false; return false;
$qry = "INSERT INTO bis.tbl_archiv (studiensemester, meldung, html, studiengang_kz, insertamum, insertvon, typ) VALUES (" $qry = "INSERT INTO bis.tbl_archiv (studiensemester_kurzbz, meldung, html, studiengang_kz, insertamum, insertvon, typ) VALUES ("
. $this->db_add_param($this->studiensemster) . "," . $this->db_add_param($this->studiensemster_kurzbz) . ","
. $this->db_add_param($this->meldung) . "," . $this->db_add_param($this->meldung) . ","
. $this->db_add_param($this->html) . "," . $this->db_add_param($this->html) . ","
. $this->db_add_param($this->studiengang_kz) . "," . $this->db_add_param($this->studiengang_kz) . ","
@@ -173,9 +173,9 @@ class bisarchiv extends basis_db
*/ */
public function getBisData($sem) public function getBisData($sem)
{ {
$qry = "SELECT id, meldung, html, studiengang_kz, insertamum, typ " $qry = "SELECT archiv_id, meldung, html, studiengang_kz, insertamum, typ "
. "FROM bis.tbl_archiv " . "FROM bis.tbl_archiv "
. "WHERE studiensemester = " . $this->db_add_param($sem) . "" . "WHERE studiensemester_kurzbz = " . $this->db_add_param($sem) . ""
. "ORDER BY insertamum DESC"; . "ORDER BY insertamum DESC";
if($this->db_query($qry)) if($this->db_query($qry))
@@ -206,15 +206,15 @@ class bisarchiv extends basis_db
return false; return false;
} }
$qry = "SELECT id, meldung, html, studiengang_kz, insertamum, typ " $qry = "SELECT archiv_id, meldung, html, studiengang_kz, insertamum, typ "
. "FROM bis.tbl_archiv " . "FROM bis.tbl_archiv "
. "WHERE id = " . $this->db_add_param($id); . "WHERE archiv_id = " . $this->db_add_param($id);
if($this->db_query($qry)) if($this->db_query($qry))
{ {
while($row = $this->db_fetch_object()) while($row = $this->db_fetch_object())
{ {
$this->id = $id; $this->archiv_id = $id;
$this->meldung = $row->meldung; $this->meldung = $row->meldung;
$this->html = $row->html; $this->html = $row->html;
$this->studiengang_kz = $row->studiengang_kz; $this->studiengang_kz = $row->studiengang_kz;
+8 -8
View File
@@ -2444,8 +2444,8 @@ if(!$result = @$db->db_query("SELECT 1 FROM bis.tbl_archiv LIMIT 1;"))
CREATE TABLE bis.tbl_archiv CREATE TABLE bis.tbl_archiv
( (
id integer, archiv_id integer,
studiensemester varchar(6), studiensemester_kurzbz varchar(6),
meldung xml, meldung xml,
html text, html text,
studiengang_kz bigint, studiengang_kz bigint,
@@ -2454,24 +2454,24 @@ if(!$result = @$db->db_query("SELECT 1 FROM bis.tbl_archiv LIMIT 1;"))
typ varchar(16) typ varchar(16)
); );
ALTER TABLE bis.tbl_archiv ADD CONSTRAINT pk_archiv PRIMARY KEY (id); ALTER TABLE bis.tbl_archiv ADD CONSTRAINT pk_archiv PRIMARY KEY (archiv_id);
CREATE SEQUENCE bis.seq_archiv_id CREATE SEQUENCE bis.seq_archiv_archiv_id
INCREMENT BY 1 INCREMENT BY 1
NO MAXVALUE NO MAXVALUE
NO MINVALUE NO MINVALUE
CACHE 1; CACHE 1;
ALTER TABLE bis.tbl_archiv ALTER COLUMN id SET DEFAULT nextval('bis.seq_archiv_id'); ALTER TABLE bis.tbl_archiv ALTER COLUMN archiv_id SET DEFAULT nextval('bis.seq_archiv_archiv_id');
ALTER TABLE bis.tbl_archiv ADD CONSTRAINT fk_archiv_studiensemester FOREIGN KEY (studiensemester) REFERENCES public.tbl_studiensemester(studiensemester_kurzbz) ON DELETE RESTRICT ON UPDATE CASCADE; ALTER TABLE bis.tbl_archiv ADD CONSTRAINT fk_archiv_studiensemester FOREIGN KEY (studiensemester_kurzbz) REFERENCES public.tbl_studiensemester(studiensemester_kurzbz) ON DELETE RESTRICT ON UPDATE CASCADE;
ALTER TABLE bis.tbl_archiv ADD CONSTRAINT fk_archiv_studiengang_kz FOREIGN KEY (studiengang_kz) REFERENCES public.tbl_studiengang(studiengang_kz) ON DELETE RESTRICT ON UPDATE CASCADE; ALTER TABLE bis.tbl_archiv ADD CONSTRAINT fk_archiv_studiengang_kz FOREIGN KEY (studiengang_kz) REFERENCES public.tbl_studiengang(studiengang_kz) ON DELETE RESTRICT ON UPDATE CASCADE;
ALTER TABLE bis.tbl_archiv ADD CONSTRAINT fk_benutzer_archiv FOREIGN KEY (insertvon) REFERENCES public.tbl_benutzer(uid) ON DELETE RESTRICT ON UPDATE CASCADE; ALTER TABLE bis.tbl_archiv ADD CONSTRAINT fk_benutzer_archiv FOREIGN KEY (insertvon) REFERENCES public.tbl_benutzer(uid) ON DELETE RESTRICT ON UPDATE CASCADE;
GRANT SELECT, INSERT, UPDATE, DELETE ON bis.tbl_archiv TO vilesci; GRANT SELECT, INSERT, UPDATE, DELETE ON bis.tbl_archiv TO vilesci;
GRANT SELECT, UPDATE ON bis.seq_archiv_id TO vilesci; GRANT SELECT, UPDATE ON bis.seq_archiv_archiv_id TO vilesci;
GRANT SELECT, INSERT, UPDATE, DELETE ON bis.tbl_archiv TO web; GRANT SELECT, INSERT, UPDATE, DELETE ON bis.tbl_archiv TO web;
GRANT SELECT, UPDATE ON bis.seq_archiv_id TO web; GRANT SELECT, UPDATE ON bis.seq_archiv_archiv_id TO web;
"; ";
if(!$db->db_query($qry)) if(!$db->db_query($qry))
echo '<strong>BIS-Archiv: '.$db->db_last_error().'</strong><br>'; echo '<strong>BIS-Archiv: '.$db->db_last_error().'</strong><br>';
+3 -3
View File
@@ -113,7 +113,7 @@ if($action != null)
} }
$bisarchiv->readFile($meldung, 'xml'); $bisarchiv->readFile($meldung, 'xml');
$bisarchiv->studiengang_kz = $stg; $bisarchiv->studiengang_kz = $stg;
$bisarchiv->studiensemster = $sem; $bisarchiv->studiensemster_kurzbz = $sem;
$bisarchiv->insertvon = $uid; $bisarchiv->insertvon = $uid;
$bisarchiv->typ = $typ; $bisarchiv->typ = $typ;
$result = $bisarchiv->save(); $result = $bisarchiv->save();
@@ -258,9 +258,9 @@ $bisarchiv->getBisData($anzeige);
echo '<td>' . $stgbez . '</td>'; echo '<td>' . $stgbez . '</td>';
echo '<td>' . $data->studiengang_kz . '</td>'; echo '<td>' . $data->studiengang_kz . '</td>';
echo '<td>' . $datum->convertISODate($data->insertamum) . '</td>'; echo '<td>' . $datum->convertISODate($data->insertamum) . '</td>';
echo '<td><a href="archiv.php?id=' . $data->id . '&action=xml">XML-Datei downloaden</a></td>'; echo '<td><a href="archiv.php?id=' . $data->archiv_id . '&action=xml">XML-Datei downloaden</a></td>';
if($data->html != '') if($data->html != '')
echo '<td><a href="archiv.php?id=' . $data->id . '&action=html" target="_blank">ansehen</a></td>'; echo '<td><a href="archiv.php?id=' . $data->archiv_id . '&action=html" target="_blank">ansehen</a></td>';
else else
echo '<td></td>'; echo '<td></td>';
echo '</tr>'; echo '</tr>';