X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=update-xmpp-status.py;h=4e5da579262f40c97a7d4912ecbd6b43093d0b2f;hb=26a46e58c6449468c98df0b7a5f94870bb9c4aea;hp=35e9473e53c3345656f13b90e987662717175653;hpb=02319119bfafbf48ef331090f7b4c2800901d6c5;p=svn42.git diff --git a/update-xmpp-status.py b/update-xmpp-status.py index 35e9473..4e5da57 100755 --- a/update-xmpp-status.py +++ b/update-xmpp-status.py @@ -58,7 +58,7 @@ class UWSConfig: self.config_parser.set('msg','bored',"The Button has been pressed ! Maybe somebody want's company. Go Visit !") self.config_parser.set('msg','present',"Somebodys presence has been detected${door_action_msg}") self.config_parser.set('msg','notpresent',"Nobody seems to be here, guess everybody left${door_action_msg}") - self.config_parser.set('msg','door_action_msg',", door ${door_status} ${by_whom}") + self.config_parser.set('msg','door_action_msg',", door last ${door_status} ${by_whom}") self.config_parser.set('msg','status_error_msg',"ERROR Last Operation took too long !!!") self.config_parser.add_section('cam') # self.config_parser.set('cam','freeze_url',"http://www.realraum.at/cgi/freeze_realraum_picture.pl?freeze=98VB9s") @@ -301,7 +301,7 @@ def substituteMessageVariables(msg, door_tuple): def formatAndDistributePresence(presence, door_tuple=(None,None)): picurl="" - if uwscfg.cam_provide_pic: + if uwscfg.cam_provide_pic == "True": picurl="\n"+uwscfg.cam_picture_url if presence == "yes": distributeXmppMsg(substituteMessageVariables(uwscfg.msg_present, door_tuple)+picurl) @@ -409,7 +409,7 @@ while True: m = RE_REQUEST.match(line) if not m is None: last_request = m.group(1,3,2) - if uwscfg.cam_provide_pic and (last_request[2] is None or not last_request[1] is None): + if uwscfg.cam_provide_pic == "True" and (last_request[2] is None or not last_request[1] is None): if not touchURL(uwscfg.cam_freeze_url) == "ok": logging.error("main: error freezing picture") continue