From 88dc470cdd7ccfb98d596754cddb9986bb74dd18 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <info@steffenvogel.de>
Date: Tue, 3 Jul 2012 18:16:13 +0200
Subject: [PATCH] seperated address and room information moved room information
 to DESCRIPTION removed double spaces from address

---
 campus/calendar.php |  29 +++++++++++++++++++----------
 campus/campus.db    | Bin 3072 -> 3072 bytes
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/campus/calendar.php b/campus/calendar.php
index 9f2f635..3816e9b 100644
--- a/campus/calendar.php
+++ b/campus/calendar.php
@@ -60,22 +60,31 @@ foreach ($headers as $header) {
 		header($key . ': ' . $value);
 }
 
+$location = '';
 $lines = explode("\r\n", $body);
 foreach ($lines as $line) {
-
 	if ($line) {
 		list($key, $value) = explode(":", $line);
-		if  ($key == 'LOCATION') {
-			$room = strtok($value, " ");
-			$address = get_address($db, $room);
+		switch ($key) {
+			case 'LOCATION':
+				$location = $value;
+				$room = strtok($location, " ");
+				$address = get_address($db, $room);
 
-			if ($address === false) {
-				$address = utf8_encode(crawl_address($room));
-				set_address($db, $room, $address);
-				$crawled = true;
-			}
-			$value = $address . ' (' . $value . ')';
+				if ($address === false) {
+					$address = preg_replace('/[ ]{2,}/sm', ' ', utf8_encode(crawl_address($room)));
+					set_address($db, $room, $address);
+					$crawled = true;
+				}
+				$value = $address . ', Aachen';
+				break;
+
+			case 'DESCRIPTION':
+				if ($value) $value .= '\n';
+				$value .= $location;
+				break;
 		}
+
 		echo $key . ':' . $value;
 	}
 	echo "\r\n";
diff --git a/campus/campus.db b/campus/campus.db
index e9965abccbf4ef716c1f438e20ec87e5a331f42a..e49e99b177d2f8c8dbfa46a3025b84ad82b97bb8 100644
GIT binary patch
delta 386
zcmZpWXpop-!?<Uo?MZe~5oQJ;U}3NTl5z|U3=E9SJaUtNb4a>af+T=|g&_k-g5{Wi
za)u^G1~mo-h793{_vGZ{r4|*J6eS*>pQ?aRKLe;<7GxIlWDQO=t_wh}8i>m>If7Hq
z><^GD1LCqW^T-$(n}STUWN^&LFUo@%Woimk1G3qK5vrAK@&ryjr3xU|1f-Rnna2dE
z)vU(A)DT7MWJ3-G9u|fTFnt`8CvfO7o|(L#Q(8%Y396e5q1ynPZV#YBu!FfL$8hQK
zRsgwR@AH6yMxRTP8{yRrle@Xh8J|o(%w?_)_A);+kF24Ap+SwIu^~f9YHmSJYEgPo
QVp3|J0>oEuCOW<b0NaL8m;e9(

delta 382
zcmZpWXpop-!+39_?MZfR1!e{yU||RVlBNs|3=E9SJf=p*re-w;riKiT8Tmzd#U(|F
zhv%m%Opf7H5CSU(Dq~OpDQ05kQJCz_At|DuU<nih8MFgPs)6K~CwFk_*}edBWkFmP
zW*%9fxdt@`29~JiDwvuA6@dW@g9IbgXjYKX(kMoI0Oi1Du}!YvP~&O<a=|vSPhP>H
z$F&2-<(SOFsi%1b$mIfA%*o8j<rZRSV9dafED5rOg+Yc1>RB$JXD8q16hnB;2Pg&h
z8aK%PXf9;0wE*S77V=D1;L>B<Gr6A2obkit?Of*Sav+=dnR(<44Gaxx42=yLLQ-=J
Va#D-ZixQJk^AsR{d@#}RJ^=4aL(%{M