fixed the Bitrix script

pbek · Mar 24, 2017 · 586f75c · 586f75c
1 parent 55006bc
commit 586f75c
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/doc/scripting/note-from-bitrix-task.qml b/doc/scripting/note-from-bitrix-task.qml
@@ -33,7 +33,7 @@ QtObject {
 
                 // https://regex101.com is your friend
 //                 var headlineRegExp = /<span class="pagetitle-inner".*?>(.+?)<\/span>/im;
-                var headlineRegExp = /<span id="pagetitle".*?>(.+?)<\/span>/im;
+                var headlineRegExp = /<span id="pagetitle".*?>(.+?)<\/?span/im;
                 var headlineMatch = headlineRegExp.exec(html);
                 var headline = headlineMatch !== null ? headlineMatch[1] : "";
                 // remove the "aufgabe" text and all "/"
@@ -67,7 +67,16 @@ QtObject {
                 var urlMatch = urlRegExp.exec(html);
                 var url = urlMatch !== null ? urlMatch[1] : "";
 
+                // fallback url parsing
+                if (url == "") {
+                    var urlRegExp = /<\/span><a href="(.+?)[\?#].*?" class="task-view-button edit.*?"/im;
+                    var urlMatch = urlRegExp.exec(html);
+                    var url = urlMatch !== null ? urlMatch[1] : "";
+                }
+
+//                script.log("headline");
 //                script.log(headline);
+//                script.log(url);
 //                script.log(descriptionMatch);
 //                script.log(description);
 //                script.log(url);