debug-version of recordings

3 files changed, 36 insertions, 26 deletions

diff --git a/css/styles.css b/css/styles.css
index 2bbc21d..3ed1def 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -115,7 +115,7 @@ table.event tr td.content .short {
 
 table.timers {
 	margin-top: 10px;
-	border: 1px solid #6D96A9; 
+	border: 1px solid #6D96A9;
 }
 
 table.timers tr td {
@@ -135,12 +135,14 @@ table.timers tr td.head {
 }
 
 /*
- * Schedule
- */
+  ##############################
+  #  Schedule
+  ##############################
+*/
 
 table.schedule {
 	margin-top: 10px;
-	border: 1px solid #6D96A9; 
+	border: 1px solid #6D96A9;
 }
 
 table.schedule tr td.head {
@@ -161,13 +163,16 @@ table.schedule tr.active {
 	background: #DEE6EE;
 }
 
+
 /*
- *  Recordings
- */
+  ##############################
+  #  Recordings
+  ##############################
+*/
 
 .recordings ul {
 	list-style-type: none;
-        /* padding: 0px; */
+        padding: 0px;
         margin: 0px;
 }
 
@@ -175,23 +180,16 @@ table.schedule tr.active {
         border: 0px solid white;
 }
 
-table.recording tr td {
-	vertical-align: top;
-	padding: 3px 7px 3px 3px;
-}
-
-
-table.recording tr.active {
-	background: #DEE6EE;
-}
 
 /*
- *  Remote Control Keypad
- */
+  ##############################
+  #  Remote Control Keypad
+  ##############################
+*/
 
 table.keypad {
 	margin-top: 10px;
-	border: 1px solid #6D96A9; 
+	border: 1px solid #6D96A9;
 }
 
 table.keypad tr td.button button {
@@ -219,9 +217,9 @@ table.keypad tr td.bluebutton button {
 }
 
 /*
-  ##########################
+  ##############################
   #  Error widget
-  ##########################
+  ##############################
 */
 
 table.error {
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index 4a8eb14..caae7ec 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -72,8 +72,13 @@ for (iter = recordingsTree.begin(path); iter != end; iter++) {
 	std::string collapseimg(level > 0 ? "plus.png" : "plus.png");
 }>
 	<li class="recording">
+<{
+	for (int i = 0; i < level; i++) {
+		reply.out() << "<img src=\"transparent.png\" alt=\"\" width=\"16\" height=\"16\" />";
+	}
+}>
 %	if (recItem->IsDir()) {
-		<a onClick="Toggle(this)" href="#">
+		<a onClick="Toggle(this)">
 %		// Die folgenden img-Tags muessen direkt auf einander folgen
 		<img class="recording_expander" src="<$ collapseimg $>" alt="" /><img class="recording_folder" src="<$ folderimg $>" alt="" />
 		<span class="recording_name"><$ recItem->Name() $></span>
@@ -84,7 +89,7 @@ for (iter = recordingsTree.begin(path); iter != end; iter++) {
 			recItemParams.add("path", *i);
 		}
 		ostringstream levelStr;
-		levelStr << ++level;
+		levelStr << (level + 1);
 		recItemParams.add("path", recItem->Name());
 		recItemParams.add("level", levelStr.str());
 		callComp("recordings.recordings_item", request, reply, recItemParams);
diff --git a/recordings.cpp b/recordings.cpp
index 0e0b365..f7e3aa7 100644
--- a/recordings.cpp
+++ b/recordings.cpp
@@ -10,6 +10,7 @@ namespace vdrlive {
 		m_recordingsLock(&Recordings)
 
 	{
+		esyslog("DH: ****** RecordingsTree::RecordingsTree() ********");
 		for ( cRecording* recording = Recordings.First(); recording != 0; recording = Recordings.Next( recording ) ) {
 			if (m_maxLevel < recording->HierarchyLevels()) {
 				m_maxLevel = recording->HierarchyLevels();
@@ -17,6 +18,8 @@ namespace vdrlive {
 
 			RecordingsItemPtr dir = m_root;
 			string name(recording->Name());
+
+			esyslog("DH: recName = '%s'", recording->Name());
 			int level = 0;
 			size_t index = 0;
 			size_t pos = 0;
@@ -30,21 +33,25 @@ namespace vdrlive {
 						RecordingsItemPtr recPtr (new RecordingsItemDir(dirName, level));
 						dir->m_entries.insert(pair< string, RecordingsItemPtr > (dirName, recPtr));
 						i = findDir(dir, dirName);
+						esyslog("DH: added dir: '%s'", dirName.c_str());
 					}
 					dir = i->second;
 					level++;
 				}
 				else {
-					string dirName(name.substr(index, name.length() - index));
-					RecordingsItemPtr recPtr (new RecordingsItemRec(dirName, recording));
-					dir->m_entries.insert(pair< string, RecordingsItemPtr > (dirName, recPtr));
+					string recName(name.substr(index, name.length() - index));
+					RecordingsItemPtr recPtr (new RecordingsItemRec(recName, recording));
+					dir->m_entries.insert(pair< string, RecordingsItemPtr > (recName, recPtr));
+					esyslog("DH: added rec: '%s'", recName.c_str());
 				}
 			} while (pos != string::npos);
 		}
+		esyslog("DH: ------ RecordingsTree::RecordingsTree() --------");
 	}
 
 	RecordingsTree::~RecordingsTree()
 	{
+		esyslog("DH: ****** RecordingsTree::~RecordingsTree() ********");
 	}
 
 	RecordingsTree::Map::iterator RecordingsTree::begin(const vector< string >& path)