diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php index 008289d94..b8db89176 100644 --- a/rdf/student.rdf.php +++ b/rdf/student.rdf.php @@ -395,6 +395,94 @@ function draw_prestudent($row) } } +function draw_empty_content() +{ + echo ' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + '; +} + // ******* Init ************************** @@ -766,19 +854,22 @@ if($xmlformat=='rdf') if($db->db_query($qry)) { - while($row = $db->db_fetch_object()) + while ($row = $db->db_fetch_object()) { - $student=new student(); - if($uid = $student->getUid($row->prestudent_id)) + $student = new student(); + if ($uid = $student->getUid($row->prestudent_id)) { //Wenn kein Eintrag fuers aktuelle Studiensemester da ist, dann //nochmal laden aber ohne studiensemester - if(!$student->load($uid, $studiensemester_kurzbz)) + if (!$student->load($uid, $studiensemester_kurzbz)) + { $student->load($uid); + } } $prestd = new prestudent(); $prestd->load($row->prestudent_id); - if($uid!='') + + if ($uid != '') { draw_content($student); draw_prestudent($prestd); @@ -823,29 +914,38 @@ if($xmlformat=='rdf') matr_nr = ".$db->db_add_param($searchItems_string_orig)." OR svnr = ".$db->db_add_param($searchItems_string_orig).";"; } - if($db->db_query($qry)) + if($result = $db->db_query($qry)) { - while($row = $db->db_fetch_object()) + if ($db->db_num_rows($result) == 0) { - $student=new student(); - if($uid = $student->getUid($row->prestudent_id)) + draw_empty_content(); + } + else + { + while ($row = $db->db_fetch_object()) { - //Wenn kein Eintrag fuers aktuelle Studiensemester da ist, dann - //nochmal laden aber ohne studiensemester - if(!$student->load($uid, $studiensemester_kurzbz)) - $student->load($uid); - } - $prestd = new prestudent(); - $prestd->load($row->prestudent_id); - if($uid!='') - { - draw_content($student); - draw_prestudent($prestd); - } - else - { - draw_content($prestd); - draw_prestudent($prestd); + $student = new student(); + if ($uid = $student->getUid($row->prestudent_id)) + { + //Wenn kein Eintrag fuers aktuelle Studiensemester da ist, dann + //nochmal laden aber ohne studiensemester + if (!$student->load($uid, $studiensemester_kurzbz)) + { + $student->load($uid); + } + } + $prestd = new prestudent(); + $prestd->load($row->prestudent_id); + if ($uid != '') + { + draw_content($student); + draw_prestudent($prestd); + } + else + { + draw_content($prestd); + draw_prestudent($prestd); + } } } } @@ -917,7 +1017,19 @@ else default: $typ = 'FH-Studiengang'; } - $qry = "SELECT * FROM campus.vw_benutzer JOIN public.tbl_benutzerfunktion USING(uid) WHERE funktion_kurzbz='rek'"; + $qry = "SELECT * + FROM PUBLIC.tbl_benutzerfunktion + JOIN campus.vw_mitarbeiter USING (uid) + WHERE funktion_kurzbz = 'rek' + AND ( + tbl_benutzerfunktion.datum_von <= now() + OR tbl_benutzerfunktion.datum_von IS NULL + ) + AND ( + tbl_benutzerfunktion.datum_bis >= now() + OR tbl_benutzerfunktion.datum_bis IS NULL + ) + ORDER BY tbl_benutzerfunktion.insertamum DESC LIMIT 1"; $rektor = ''; if($db->db_query($qry)) {