v0.87

scripting · Jun 9, 2014 · 5bbf78f · 5bbf78f
1 parent e3edcbc
commit 5bbf78f
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -77,6 +77,10 @@ Specifically thanks to Dan for writing the excellent <a href="https://github.com
 
 #### Changes
 
+##### v0.87 -- 6/09/14 by DW
+
+Fixed a bug that would cause River4 to crash when processing an item with a null title. 
+
 ##### v0.86 -- 6/09/14 by DW
 
 Fixed a bug that would cause River4 to crash when reading an item from a subscription list that didn't have an xmlUrl attribute. 

diff --git a/opml/dashboard.opml b/opml/dashboard.opml
@@ -1,5 +1,5 @@
 <?xml encoding="ISO-8859-1" version="1.0"?>
-<!-- OPML generated by OPML Editor v0.75 on 6/4/14; 7:26:35 PM -->
+<!-- OPML generated by OPML Editor v0.75 on 6/9/14; 11:34:22 AM -->
 <opml version="2.0">
 	<head>
 		<title>dashboard.html</title>

diff --git a/opml/river4.opml b/opml/river4.opml
@@ -1,5 +1,5 @@
 <?xml encoding="ISO-8859-1" version="1.0"?>
-<!-- OPML generated by OPML Editor v0.75 on 6/9/14; 7:55:57 AM -->
+<!-- OPML generated by OPML Editor v0.75 on 6/9/14; 11:36:55 AM -->
 <opml version="2.0">
 	<head>
 		<title>river4.js</title>
@@ -11,7 +11,7 @@
 		<windowRight>1500</windowRight>
 		</head>
 	<body text="river4.js">
-		<outline text="var myVersion = &quot;0.86&quot;, myProductName = &quot;River4&quot;, flRunningOnServer = true;"></outline>
+		<outline text="var myVersion = &quot;0.87&quot;, myProductName = &quot;River4&quot;, flRunningOnServer = true;"></outline>
 		<outline text=""></outline>
 		<outline isComment="true" text="notes, building, testing">
 			<outline text="npm install MD5"></outline>
@@ -21,7 +21,7 @@
 			<outline text="heroku config:set s3path=/tmp.fargo.io/river4/"></outline>
 			<outline text=""></outline>
 			<outline text="workspace.river4builder.script ()">
-				<outline isComment="true" text="&quot;6/6/14; 2:00:29 PM&quot;"></outline>
+				<outline isComment="true" text="&quot;6/9/14; 8:10:09 AM&quot;"></outline>
 				</outline>
 			<outline text=""></outline>
 			<outline text="testing">
@@ -43,7 +43,7 @@
 				<outline text=""></outline>
 				<outline text=""></outline>
 				<outline text="tcp.httpreadurl (&quot;http://river4.scripting.com/now&quot;)">
-					<outline isComment="true" text="&quot;Fri May 30 2014 08:18:23 GMT-0400 (EDT)&quot;"></outline>
+					<outline isComment="true" text="&quot;Mon Jun 09 2014 08:05:57 GMT-0400 (EDT)&quot;"></outline>
 					</outline>
 				<outline text="tcp.httpreadurl (&quot;http://river4.herokuapp.com/version&quot;)">
 					<outline isComment="true" text="&quot;0.65&quot;"></outline>

diff --git a/opml/river4homepage.opml b/opml/river4homepage.opml
@@ -1,5 +1,5 @@
 <?xml encoding="ISO-8859-1" version="1.0"?>
-<!-- OPML generated by OPML Editor v0.75 on 6/4/14; 7:26:35 PM -->
+<!-- OPML generated by OPML Editor v0.75 on 6/9/14; 11:34:21 AM -->
 <opml version="2.0">
 	<head>
 		<title>river4homepage.html</title>

diff --git a/opml/utils.opml b/opml/utils.opml
@@ -1,5 +1,5 @@
 <?xml encoding="ISO-8859-1" version="1.0"?>
-<!-- OPML generated by OPML Editor v0.75 on 6/4/14; 7:26:31 PM -->
+<!-- OPML generated by OPML Editor v0.75 on 6/9/14; 11:34:16 AM -->
 <opml version="2.0">
 	<head>
 		<title>utils.js</title>
@@ -382,6 +382,15 @@
 			<outline text="}"></outline>
 			</outline>
 		<outline text="function stripMarkup (s) { //5/24/14 by DW">
+			<outline isComment="true" text="Changes">
+				<outline text="6/9/14; 11:33:37 AM by DW">
+					<outline text="River4 is crashing when we pass null to stripMarkup. So add some defensive driving."></outline>
+					</outline>
+				</outline>
+			<outline text="if ((s === undefined) || (s == null) || (s.length == 0)) {">
+				<outline text="return (&quot;&quot;);"></outline>
+				<outline text="}"></outline>
+				</outline>
 			<outline text="return (s.replace (/(&lt;([^&gt;]+)&gt;)/ig, &quot;&quot;));"></outline>
 			<outline text="}"></outline>
 			</outline>

diff --git a/river4.js b/river4.js
@@ -1,4 +1,4 @@
-var myVersion = "0.86", myProductName = "River4", flRunningOnServer = true;
+var myVersion = "0.87", myProductName = "River4", flRunningOnServer = true;
 
 
 var http = require ("http"); 
@@ -484,6 +484,9 @@ function dateYesterday (d) {
 	return (new Date (new Date (d) - (24 * 60 * 60 * 1000)));
 	}
 function stripMarkup (s) { //5/24/14 by DW
+	if ((s === undefined) || (s == null) || (s.length == 0)) {
+		return ("");
+		}
 	return (s.replace (/(<([^>]+)>)/ig, ""));
 	}
 function maxStringLength (s, len, flWholeWordAtEnd, flAddElipses) {