proper concat for hourlies
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,18 @@
*.pyc
/nbproject/private/
/output.txt
+
+bin
+gen
+target
+.settings
+.classpath
+.project
+*.keystore
+*.swp
+*.orig
+*.log
+*.properties
+seed.txt
+map.txt
+
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" name="Default" comment="">
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/copyright/profiles_settings.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/404.html" afterPath="$PROJECT_DIR$/404.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/Chart.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/Chart.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/Color.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/Color.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/Flotr.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/Flotr.js" />
@@ -13,55 +9,42 @@
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/lib/base64.js" afterPath="$PROJECT_DIR$/js/flotr2/lib/base64.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/basic.json" afterPath="$PROJECT_DIR$/js/flotr2/make/basic.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/build.json" afterPath="$PROJECT_DIR$/js/flotr2/make/build.json" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/calllog.php" afterPath="$PROJECT_DIR$/calllog.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/calls.json.php" afterPath="$PROJECT_DIR$/calls.json.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/common.inc.php" afterPath="$PROJECT_DIR$/common.inc.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/examples.js" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/examples.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/examples.json" afterPath="$PROJECT_DIR$/js/flotr2/make/examples.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/extending-flotr.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/extending-flotr.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/flotr2.json" afterPath="$PROJECT_DIR$/js/flotr2/make/flotr2.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/js/flotr2.stable.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/js/flotr2.stable.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/lib/codemirror/lib/util/formatting.js" afterPath="$PROJECT_DIR$/js/flotr2/examples/lib/codemirror/lib/util/formatting.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/generateConvos.php" afterPath="$PROJECT_DIR$/generateConvos.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/getfile.php" afterPath="$PROJECT_DIR$/getfile.php" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/generateHourlys.php" afterPath="$PROJECT_DIR$/generateHourlys.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/ie.json" afterPath="$PROJECT_DIR$/js/flotr2/make/ie.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/index.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/index.html" afterPath="$PROJECT_DIR$/js/flotr2/spec/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine-html.js" afterPath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine-html.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine.css" afterPath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine.js" afterPath="$PROJECT_DIR$/js/flotr2/lib/jasmine/jasmine.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/vendor/jquery-1.8.0.min.js" afterPath="$PROJECT_DIR$/js/vendor/jquery-1.8.0.min.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json-data.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json-data.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json-real-data.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json-real-data.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json.txt" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/json.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/make/lib.json" afterPath="$PROJECT_DIR$/js/flotr2/make/lib.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/logarithmic-scale.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/logarithmic-scale.html" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/vendor/modernizr-2.6.1.min.js" afterPath="$PROJECT_DIR$/js/vendor/modernizr-2.6.1.min.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/mouse-zoom-preview.html" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/mouse-zoom-preview.html" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/nbproject/project.xml" afterPath="$PROJECT_DIR$/nbproject/project.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/lib/prototype.js" afterPath="$PROJECT_DIR$/js/flotr2/lib/prototype.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/scannr.iml" afterPath="$PROJECT_DIR$/.idea/scannr.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/scannr.py" afterPath="$PROJECT_DIR$/scannr.py" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/snd.py" afterPath="$PROJECT_DIR$/snd.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/examples/old_examples/style.css" afterPath="$PROJECT_DIR$/js/flotr2/examples/old_examples/style.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/js/test-background.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/js/test-background.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/js/test-boundaries.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/js/test-boundaries.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/flotr2/spec/js/test-mountain-nulls.js" afterPath="$PROJECT_DIR$/js/flotr2/spec/js/test-mountain-nulls.js" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test.py" afterPath="$PROJECT_DIR$/test.py" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test2.py" afterPath="$PROJECT_DIR$/test2.py" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/trunklog.php" afterPath="$PROJECT_DIR$/trunklog.php" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/viewcalls.php" afterPath="$PROJECT_DIR$/viewcalls.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="scannr.iws" />
<ignored path=".idea/workspace.xml" />
- <file path="/Dummy.txt" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356154429152" ignored="false" />
+ <file path="/Dummy.txt" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356959804071" ignored="false" />
<file path="/calllog.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356153807482" ignored="false" />
<file path="/scannr.py" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356154551131" ignored="false" />
<file path="/start_script.py" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356155203132" ignored="false" />
<file path="/a.java" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356155211924" ignored="false" />
<file path="/a.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356155216083" ignored="false" />
+ <file path="/calls.json.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356155700744" ignored="false" />
+ <file path="/generateHourlys.php" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1356960167594" ignored="false" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -76,7 +59,6 @@
<disable_hints />
</component>
<component name="DebuggerManager">
- <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
<breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
<breakpoint>
<option name="NOTIFY_CAUGHT" value="true" />
@@ -111,6 +93,7 @@
<option name="LOG_MESSAGE" value="" />
</breakpoint>
</breakpoint_any>
+ <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
<breakpoint_rules />
<ui_properties />
</component>
@@ -123,16 +106,43 @@
<file leaf-file-name="calllog.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/calllog.php">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="0" selection-start="189" selection-end="189" vertical-scroll-proportion="0.0">
+ <state line="2" column="0" selection-start="34" selection-end="226" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="scannr.py" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/scannr.py">
+ <file leaf-file-name="calls.json.php" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/calls.json.php">
<provider selected="true" editor-type-id="text-editor">
- <state line="80" column="64" selection-start="2271" selection-end="2271" vertical-scroll-proportion="-0.31178707">
+ <state line="13" column="53" selection-start="499" selection-end="499" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="generateConvos.php" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/generateConvos.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="generateHourlys.php" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/generateHourlys.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="23" column="6" selection-start="1012" selection-end="1012" vertical-scroll-proportion="0.68944097">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="getfile.php" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/getfile.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="11" column="13" selection-start="471" selection-end="539" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -158,10 +168,11 @@
<option name="changedFiles">
<list>
<option value="$PROJECT_DIR$/common.inc.php" />
- <option value="$PROJECT_DIR$/calls.json.php" />
<option value="$PROJECT_DIR$/viewcalls.php" />
<option value="$PROJECT_DIR$/calllog.php" />
<option value="$PROJECT_DIR$/scannr.py" />
+ <option value="$PROJECT_DIR$/calls.json.php" />
+ <option value="$PROJECT_DIR$/generateHourlys.php" />
</list>
</option>
</component>
@@ -169,7 +180,7 @@
<component name="ProjectFrameBounds">
<option name="y" value="22" />
<option name="width" value="1680" />
- <option name="height" value="937" />
+ <option name="height" value="936" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<OptionsSetting value="true" id="Add" />
@@ -197,6 +208,7 @@
<sortByType />
</navigator>
<panes>
+ <pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
@@ -218,17 +230,16 @@
</PATH>
</subPane>
</pane>
- <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="options.splitter.main.proportions" value="0.3" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="options.lastSelected" value="tasks" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../busui/myway/myway_timeliness.php" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/../disclosr" />
<property name="FullScreen" value="false" />
+ <property name="options.searchVisible" value="true" />
<property name="options.splitter.details.proportions" value="0.2" />
- <property name="options.searchVisible" value="true" />
</component>
<component name="PyConsoleOptionsProvider">
<option name="myPythonConsoleState">
@@ -238,9 +249,35 @@
<PyConsoleSettings />
</option>
</component>
+ <component name="RecentsManager">
+ <key name="CopyFile.RECENT_KEYS">
+ <recent name="$PROJECT_DIR$" />
+ </key>
+ </component>
<component name="RunManager">
<configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
<TestRunner />
+ <method />
+ </configuration>
+ <configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console">
+ <method />
+ </configuration>
+ <configuration default="true" type="tests" factoryName="Doctests">
+ <option name="INTERPRETER_OPTIONS" value="" />
+ <option name="PARENT_ENVS" value="true" />
+ <envs />
+ <option name="SDK_HOME" value="" />
+ <option name="WORKING_DIRECTORY" value="" />
+ <option name="IS_MODULE_SDK" value="false" />
+ <module name="scannr" />
+ <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+ <option name="SCRIPT_NAME" value="" />
+ <option name="CLASS_NAME" value="" />
+ <option name="METHOD_NAME" value="" />
+ <option name="FOLDER_NAME" value="" />
+ <option name="TEST_TYPE" value="TEST_SCRIPT" />
+ <option name="PATTERN" value="" />
+ <option name="USE_PATTERN" value="false" />
<method />
</configuration>
<configuration default="true" type="JavascriptDebugSession" factoryName="Local" singleton="true">
@@ -280,21 +317,21 @@
<servers />
</component>
<component name="ToolWindowManager">
- <frame x="0" y="22" width="1680" height="937" extended-state="6" />
+ <frame x="0" y="22" width="1680" height="936" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32925338" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32843137" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19645043" sideWeight="0.6707466" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19645043" sideWeight="0.67156863" order="0" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -364,92 +401,92 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/viewcalls.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="2" column="13" selection-start="46" selection-end="46" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/common.inc.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="34" column="0" selection-start="1179" selection-end="1179" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/calls.json.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="2" column="9" selection-start="42" selection-end="42" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/trunklog.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../disclosr/include/template.inc.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="72" column="93" selection-start="2545" selection-end="2635" vertical-scroll-proportion="0.43404254" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../disclosr/include/common.inc.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../busui/myway/myway_timeliness.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="27" column="5" selection-start="1003" selection-end="1018" vertical-scroll-proportion="26.346153" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/snd.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/common.inc.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="60" column="117" selection-start="2262" selection-end="2262" vertical-scroll-proportion="-39.23077" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/viewcalls.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="41" column="69" selection-start="1388" selection-end="1388" vertical-scroll-proportion="1.2659575" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/scannr.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="80" column="64" selection-start="2271" selection-end="2271" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/calllog.php">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="0" selection-start="189" selection-end="189" vertical-scroll-proportion="0.0">
+ <state line="2" column="0" selection-start="34" selection-end="226" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/scannr.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="12" column="21" selection-start="328" selection-end="328" vertical-scroll-proportion="0.0">
+ <entry file="file://$PROJECT_DIR$/calls.json.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="13" column="53" selection-start="499" selection-end="499" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/calllog.php">
+ <entry file="file://$PROJECT_DIR$/generateConvos.php">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/viewcalls.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="2" column="13" selection-start="46" selection-end="46" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/common.inc.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="34" column="0" selection-start="1179" selection-end="1179" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/calls.json.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="2" column="9" selection-start="42" selection-end="42" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/trunklog.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../disclosr/include/template.inc.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="72" column="93" selection-start="2545" selection-end="2635" vertical-scroll-proportion="0.43404254" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../disclosr/include/common.inc.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../busui/myway/myway_timeliness.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="27" column="5" selection-start="1003" selection-end="1018" vertical-scroll-proportion="26.346153" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/snd.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/common.inc.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="60" column="117" selection-start="2262" selection-end="2262" vertical-scroll-proportion="-39.23077" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/calls.json.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="72" column="41" selection-start="2843" selection-end="2843" vertical-scroll-proportion="-43.153847" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/viewcalls.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="41" column="69" selection-start="1388" selection-end="1388" vertical-scroll-proportion="1.2659575" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/calllog.php">
- <provider selected="true" editor-type-id="text-editor">
- <state line="9" column="0" selection-start="189" selection-end="189" vertical-scroll-proportion="0.0">
+ <entry file="file://$PROJECT_DIR$/getfile.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="11" column="13" selection-start="471" selection-end="539" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/scannr.py">
- <provider selected="true" editor-type-id="text-editor">
- <state line="80" column="64" selection-start="2271" selection-end="2271" vertical-scroll-proportion="-0.31178707">
+ <entry file="file://$PROJECT_DIR$/generateHourlys.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="23" column="6" selection-start="1012" selection-end="1012" vertical-scroll-proportion="0.68944097">
<folding />
</state>
</provider>
--- a/calls.json.php
+++ b/calls.json.php
@@ -8,7 +8,7 @@
group by tgid, date_trunc(\'hour\', call_timestamp) order by time');
$sth->execute(Array($timeFrom, $timeTo));
- return $sth->fetchAll();
+ return $sth->fetchAll(PDO::FETCH_ASSOC);
}
@@ -20,7 +20,7 @@
group by sensor_id, date_trunc(\'day\', time) order by time');
$sth->execute(Array($TGID));
- return $sth->fetchAll();
+ return $sth->fetchAll(PDO::FETCH_ASSOC);
}
function getTGIDDataYears($TGID, $timeFrom, $timeTo)
{
@@ -28,7 +28,7 @@
$sth = $conn->prepare("select distinct extract('year' from call_timestamp) as year from recordings where tgid = ? order by year");
$sth->execute(Array($TGID));
- return $sth->fetchAll();
+ return $sth->fetchAll(PDO::FETCH_ASSOC);
}
function getTGIDDataMonths($TGID, $timeFrom, $timeTo)
@@ -37,7 +37,7 @@
$sth = $conn->prepare("select distinct extract('month' from call_timestamp) as month, extract('year' from call_timestamp) as year from recordings where tgid = ? order by year, month");
$sth->execute(Array($TGID));
- return $sth->fetchAll();
+ return $sth->fetchAll(PDO::FETCH_ASSOC);
}
function getTGIDDataDays($TGID, $timeFrom, $timeTo)
@@ -47,13 +47,21 @@
$sth->execute(Array($TGID));
- return $sth->fetchAll();
+ return $sth->fetchAll(PDO::FETCH_ASSOC);
}
$action = (isset($_REQUEST['action']) ? $_REQUEST['action'] : '');
$TGID = (isset($_REQUEST['tgid']) ? $_REQUEST['tgid'] : '');
$timefrom = (isset($_REQUEST['from']) ? $_REQUEST['from'] : '');
$timeto = (isset($_REQUEST['to']) ? $_REQUEST['to'] : '');
+if ($action == "data") {
+$sth = $conn->prepare('select * from recordings
+ order by call_timestamp desc limit 100');
+
+$sth->execute(Array());
+
+echo json_encode ($sth->fetchAll(PDO::FETCH_ASSOC));
+}
if ($action == "data_description") {
$timefrom = strtotime($timefrom);
$timeto = strtotime($timeto);
--- a/db.sql
+++ b/db.sql
@@ -1,10 +1,7 @@
+-- /usr/pgsql-9.1/bin/pg_dump --schema-only scannr
--
-- PostgreSQL database dump
--
-
--- Dumped from database version 9.1.2
--- Dumped by pg_dump version 9.1.2
--- Started on 2012-10-21 18:20:20
SET statement_timeout = 0;
SET client_encoding = 'UTF8';
@@ -13,7 +10,6 @@
SET client_min_messages = warning;
--
--- TOC entry 162 (class 3079 OID 11639)
-- Name: plpgsql; Type: EXTENSION; Schema: -; Owner:
--
@@ -21,8 +17,6 @@
--
--- TOC entry 1856 (class 0 OID 0)
--- Dependencies: 162
-- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner:
--
@@ -36,8 +30,6 @@
SET default_with_oids = false;
--
--- TOC entry 161 (class 1259 OID 62391)
--- Dependencies: 1847 6
-- Name: recordings; Type: TABLE; Schema: public; Owner: postgres; Tablespace:
--
@@ -54,12488 +46,22 @@
ALTER TABLE public.recordings OWNER TO postgres;
--
--- TOC entry 1850 (class 0 OID 62391)
--- Dependencies: 161
--- Data for Name: recordings; Type: TABLE DATA; Schema: public; Owner: postgres
+-- Name: tgids; Type: TABLE; Schema: public; Owner: postgres; Tablespace:
--
-COPY recordings (filename, tgid, tgname, sitename, call_timestamp, length) FROM stdin;
-2012-09-30-1348998992.35-demo.wav 44028 CanberraBlackMnt 2012-09-30 19:56:35.268+10 254088
-2012-09-30-1348998995.69-demo.wav 44028 CanberraBlackMnt 2012-09-30 19:56:38.733+10 256136
-2012-09-30-1348998999.93-demo.wav 44028 CanberraBlackMnt 2012-09-30 19:56:45.913+10 587902
-2012-09-30-1348999006.13-demo.wav 44028 CanberraBlackMnt 2012-09-30 19:56:54.567+10 698570
-2012-09-30-1348999016.18-demo.wav 44028 CanberraBlackMnt 2012-09-30 19:57:00.87+10 481854
-2012-09-30-1348999732.25-demo.wav 44028 CanberraBlackMnt 2012-09-30 20:09:14.875+10 234110
-2012-10-01-1349049204.29-demo.wav 30004 L GEORG CanberraMtAinsli 2012-10-01 09:53:26.799+10 208816
-2012-10-01-1349049226.73-demo.wav 30004 L GEORG CanberraMtAinsli 2012-10-01 09:53:51.106+10 368776
-2012-10-01-1349049233.21-demo.wav 30004 L GEORG CanberraBlackMnt 2012-10-01 09:54:09.788+10 1388118
-2012-10-01-1349049249.98-demo.wav 30004 L GEORG CanberraBlackMnt 2012-10-01 09:54:17.872+10 663688
-2012-10-01-1349049264.24-demo.wav 30004 L GEORG CanberraMtAinsli 2012-10-01 09:54:30.636+10 538760
-2012-10-01-1349049270.91-demo.wav 30004 L GEORG CanberraMtAinsli 2012-10-01 09:54:33.547+10 223368
-2012-10-01-1349049332.89-demo.wav 10123 GOULB1 CanberraMtAinsli 2012-10-01 09:55:35.416+10 211876
-2012-10-01-1349049500.43-demo.wav 10123 GOULB1 CanberraMtAinsli 2012-10-01 09:58:24.513+10 342452
-2012-10-01-1349049504.69-demo.wav 10123 GOULB1 CanberraMtAinsli 2012-10-01 09:58:26.976+10 194696
-2012-10-01-1349049507.06-demo.wav 10123 GOULB1 CanberraMtAinsli 2012-10-01 09:58:29.354+10 194670
-2012-10-01-1349049509.44-demo.wav 10123 GOULB1 CanberraMtAinsli 2012-10-01 09:58:34.742+10 396850
-2012-10-01-1349049779.09-demo.wav 10123 GOULB1 CanberraMtAinsli 2012-10-01 10:03:04.97+10 492576
-2012-10-01-1349049786.9-demo.wav 10123 GOULB1 CanberraMtAinsli 2012-10-01 10:03:12.308+10 452698
-2012-10-01-1349049792.46-demo.wav