From ce43fed28fba45b2fbbe94a1eaf0ac53c9a87a17 Mon Sep 17 00:00:00 2001
From: ste-fan <s.t.e-f.a.n@web.de>
Date: Sun, 12 Oct 2014 16:14:42 +0200
Subject: [PATCH] Fix reverse number search for dasoertliche.de

almost complete rewrite of sed script in _reverse_dasoertliche_extract
function, using _reverse_telefonbuch_extract as general template
---
 ChangeLog                                     |  4 ++
 .../lib/callmonitor/reverse/dasoertliche.sh   | 40 +++++++++----------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8ef0ec5..c22e2aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -981,3 +981,7 @@
 2013-02-24:
 
 	callmonitor-1.20.9 (beta)
+
+2014-10-12:
+
+	* reverse: DasÖrtliche repariert
diff --git a/base/usr/lib/callmonitor/reverse/dasoertliche.sh b/base/usr/lib/callmonitor/reverse/dasoertliche.sh
index f701acf..d8b48ea 100644
--- a/base/usr/lib/callmonitor/reverse/dasoertliche.sh
+++ b/base/usr/lib/callmonitor/reverse/dasoertliche.sh
@@ -9,29 +9,27 @@ _reverse_dasoertliche_request() {
 }
 _reverse_dasoertliche_extract() {
    sed -n -e '
-	: main
         \#Kein Teilnehmer gefunden:\|keine Treffer finden# {
-	    '"$REVERSE_NA"'
-	}
-	\#<div[[:space:]]\+class="adresse\([[:space:]][^"]*\)\?"[[:space:]]*>#,\#<div[[:space:]]class="\(zusatz\|topx\)"# {
-	    \#<div \+class="counter"# d
-	    \#<script #,\#</script># d
-	    s#^.*<a[[:space:]][^>]*class="preview[^"]*"[^>]*>\(.*\)$#\1#
-	    t holdname
-	    \#<div[[:space:]]class="\(zusatz\|topx\)"# b cleanup
-	    H
+            '"$REVERSE_NA"'
+        }
+        \#<div[[:space:]]\+class="hit[^>]\+id="entry_1#,\#</address[[:space:]]*># {
+            \#<a[[:space:]]#,\#</a[[:space:]]*># {
+                H
+                \#</a># {
+                    g
+                    s#.*#<rev:name>&</rev:name>#
+                    h
+                }
+            }
+            \#<address#,\#</address[[:space:]]*># {
+                H
+                \#</address[[:space:]]*># b found
+            }
         }
         b
-
-        : holdname
-	s#.*#<rev:name>&</rev:name>#
-        h
-	b
-
-	: cleanup
-	g
-	s/\(<br\/>\)\?\n\|<br\/>/, /g
-	'"$REVERSE_SANITIZE"'
-	'"$REVERSE_OK"'
+        :found
+        g
+        '"$REVERSE_SANITIZE"'
+        '"$REVERSE_OK"'
     '
 }