--- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,7 +2,6 @@ <project version="4"> <component name="VcsDirectoryMappings"> <mapping directory="$PROJECT_DIR$" vcs="Git" /> - <mapping directory="$PROJECT_DIR$/js/flotr2" vcs="Git" /> <mapping directory="$PROJECT_DIR$/pynma" vcs="Git" /> </component> </project>
--- a/.idea/workspace.xml +++ /dev/null @@ -1,457 +1,1 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ChangeListManager"> - <list default="true" id="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/common.inc.php" afterPath="$PROJECT_DIR$/common.inc.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="1357864234218" 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="1357778581260" ignored="false" /> - <file path="/db.sql" changelist="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" time="1357778259550" ignored="false" /> - <option name="TRACKING_ENABLED" value="true" /> - <option name="SHOW_DIALOG" value="false" /> - <option name="HIGHLIGHT_CONFLICTS" value="true" /> - <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> - <option name="LAST_RESOLUTION" value="IGNORE" /> - </component> - <component name="ChangesViewManager" flattened_view="true" show_ignored="false" /> - <component name="CreatePatchCommitExecutor"> - <option name="PATCH_PATH" value="" /> - </component> - <component name="DaemonCodeAnalyzer"> - <disable_hints /> - </component> - <component name="DebuggerManager"> - <breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true"> - <breakpoint> - <option name="NOTIFY_CAUGHT" value="true" /> - <option name="NOTIFY_UNCAUGHT" value="true" /> - <option name="ENABLED" value="false" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="SUSPEND" value="true" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="true" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint> - <option name="NOTIFY_CAUGHT" value="true" /> - <option name="NOTIFY_UNCAUGHT" value="true" /> - <option name="ENABLED" value="false" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="SUSPEND" value="true" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="true" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - </breakpoint_any> - <ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" /> - <breakpoint_rules /> - <ui_properties /> - </component> - <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> - <component name="FavoritesManager"> - <favorites_list name="scannr" /> - </component> - <component name="FileEditorManager"> - <leaf> - <file leaf-file-name="viewcalls.php" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/viewcalls.php"> - <provider selected="true" editor-type-id="text-editor"> - <state line="14" column="55" selection-start="583" selection-end="583" vertical-scroll-proportion="0.31111112"> - <folding> - <element signature="n#style#0;n#span#0;n#td#0;n#tr#0;n#table#0;n#div#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#0;n#td#1;n#tr#0;n#table#0;n#div#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#0;n#td#2;n#tr#0;n#table#0;n#div#0;n#!!top" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="common.inc.php" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/common.inc.php"> - <provider selected="true" editor-type-id="text-editor"> - <state line="72" column="49" selection-start="2814" selection-end="2814" vertical-scroll-proportion="-17.5"> - <folding> - <marker date="1357865020704" expanded="true" signature="2886:3131" placeholder="..." /> - <marker date="1357865020704" expanded="true" signature="2955:2993" placeholder="..." /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="datepicker.php" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/datepicker.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> - </leaf> - </component> - <component name="FindManager"> - <FindUsagesManager> - <setting name="OPEN_NEW_TAB" value="false" /> - </FindUsagesManager> - </component> - <component name="Git.Settings"> - <option name="SYNC_SETTING" value="DONT" /> - <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> - </component> - <component name="GitLogSettings"> - <option name="myDateState"> - <MyDateState /> - </option> - </component> - <component name="IdeDocumentHistory"> - <option name="changedFiles"> - <list> - <option value="$PROJECT_DIR$/calllog.php" /> - <option value="$PROJECT_DIR$/scannr.py" /> - <option value="$PROJECT_DIR$/calls.json.php" /> - <option value="$PROJECT_DIR$/db.sql" /> - <option value="$PROJECT_DIR$/generateHourlys.php" /> - <option value="$PROJECT_DIR$/viewcalls.php" /> - <option value="$PROJECT_DIR$/common.inc.php" /> - </list> - </option> - </component> - <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" interpreter_name="PHP" /> - <component name="ProjectFrameBounds"> - <option name="x" value="-4" /> - <option name="width" value="1608" /> - <option name="height" value="874" /> - </component> - <component name="ProjectLevelVcsManager" settingsEditedManually="true"> - <OptionsSetting value="true" id="Add" /> - <OptionsSetting value="true" id="Remove" /> - <OptionsSetting value="true" id="Checkout" /> - <OptionsSetting value="true" id="Update" /> - <OptionsSetting value="true" id="Status" /> - <OptionsSetting value="true" id="Edit" /> - <ConfirmationsSetting value="0" id="Add" /> - <ConfirmationsSetting value="0" id="Remove" /> - </component> - <component name="ProjectReloadState"> - <option name="STATE" value="0" /> - </component> - <component name="ProjectView"> - <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5"> - <flattenPackages /> - <showMembers /> - <showModules /> - <showLibraryContents ProjectPane="true" /> - <hideEmptyPackages /> - <abbreviatePackageNames /> - <autoscrollToSource /> - <autoscrollFromSource /> - <sortByType /> - </navigator> - <panes> - <pane id="ProjectPane"> - <subPane> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="scannr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="scannr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="scannr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="scannr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="scannr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="js" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - </subPane> - </pane> - <pane id="PackagesPane" /> - <pane id="Scope" /> - </panes> - </component> - <component name="PropertiesComponent"> - <property name="options.lastSelected" value="preferences.pluginManager" /> - <property name="WebServerToolWindowFactoryState" value="false" /> - <property name="options.splitter.details.proportions" value="0.2" /> - <property name="options.searchVisible" value="true" /> - <property name="options.splitter.main.proportions" value="0.3" /> - <property name="last_opened_file_path" value="$PROJECT_DIR$/../disclosr" /> - <property name="FullScreen" value="false" /> - </component> - <component name="PyConsoleOptionsProvider"> - <option name="myPythonConsoleState"> - <PyConsoleSettings /> - </option> - <option name="myDjangoConsoleState"> - <PyConsoleSettings /> - </option> - </component> - <component name="RecentsManager"> - <key name="CopyFile.RECENT_KEYS"> - <recent name="$PROJECT_DIR$" /> - </key> - </component> - <component name="RunManager"> - <configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console"> - <method /> - </configuration> - <configuration default="true" type="JavascriptDebugSession" factoryName="Local" singleton="true"> - <JSDebuggerConfigurationSettings> - <option name="engineId" value="embedded" /> - <option name="fileUrl" /> - </JSDebuggerConfigurationSettings> - <method /> - </configuration> - <list size="0" /> - </component> - <component name="ShelveChangesManager" show_recycled="false" /> - <component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="false"> - <option name="USER" value="" /> - <option name="PASSWORD" value="" /> - <option name="mySSHConnectionTimeout" value="30000" /> - <option name="mySSHReadTimeout" value="30000" /> - <option name="LAST_MERGED_REVISION" /> - <option name="MERGE_DRY_RUN" value="false" /> - <option name="MERGE_DIFF_USE_ANCESTRY" value="true" /> - <option name="UPDATE_LOCK_ON_DEMAND" value="false" /> - <option name="IGNORE_SPACES_IN_MERGE" value="false" /> - <option name="DETECT_NESTED_COPIES" value="true" /> - <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" /> - <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" /> - <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" /> - <option name="FORCE_UPDATE" value="false" /> - <option name="IGNORE_EXTERNALS" value="false" /> - <myIsUseDefaultProxy>false</myIsUseDefaultProxy> - </component> - <component name="TaskManager"> - <task active="true" id="Default" summary="Default task"> - <changelist id="f90ee5b5-97e4-47ec-9b14-d4f4e896f100" name="Default" comment="" /> - <created>1350026709905</created> - <updated>1350026709905</updated> - </task> - <servers /> - </component> - <component name="ToolWindowManager"> - <frame x="-4" y="0" width="1608" height="874" 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="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="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="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="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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1962677" sideWeight="0.6721763" order="0" side_tool="false" content_ui="combo" /> - <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="Database" 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="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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3278237" sideWeight="0.5" order="7" 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="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" /> - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> - <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="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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - </layout> - </component> - <component name="VcsContentAnnotationSettings"> - <option name="myLimit" value="2678400000" /> - </component> - <component name="VcsManagerConfiguration"> - <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" /> - <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" /> - <option name="CHECK_NEW_TODO" value="true" /> - <option name="myTodoPanelSettings"> - <value> - <are-packages-shown value="false" /> - <are-modules-shown value="false" /> - <flatten-packages value="false" /> - <is-autoscroll-to-source value="false" /> - </value> - </option> - <option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" /> - <option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" /> - <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" /> - <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" /> - <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" /> - <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" /> - <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" /> - <option name="CHANGED_ON_SERVER_INTERVAL" value="60" /> - <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" /> - <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" /> - <option name="DEFAULT_PATCH_EXTENSION" value="patch" /> - <option name="SHORT_DIFF_HORISONTALLY" value="true" /> - <option name="SHORT_DIFF_EXTRA_LINES" value="2" /> - <option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" /> - <option name="INCLUDE_TEXT_INTO_PATCH" value="false" /> - <option name="INCLUDE_TEXT_INTO_SHELF" value="false" /> - <option name="SHOW_FILE_HISTORY_DETAILS" value="true" /> - <option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" /> - <option name="SHOW_DIRTY_RECURSIVELY" value="false" /> - <option name="LIMIT_HISTORY" value="true" /> - <option name="MAXIMUM_HISTORY_ROWS" value="1000" /> - <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> - <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" /> - <option name="LAST_COMMIT_MESSAGE" /> - <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" /> - <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> - <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" /> - <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" /> - <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" /> - <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" /> - <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" /> - <option name="ACTIVE_VCS_NAME" /> - <option name="UPDATE_GROUP_BY_PACKAGES" value="false" /> - <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" /> - <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> - <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> - </component> - <component name="XDebuggerManager"> - <breakpoint-manager /> - </component> - <component name="antWorkspaceConfiguration"> - <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> - <option name="FILTER_TARGETS" value="false" /> - </component> - <component name="editorHistoryManager"> - <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$/../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$/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$/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" /> - </provider> - </entry> - <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" /> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/db.sql"> - <provider selected="true" editor-type-id="text-editor"> - <state line="94" column="0" selection-start="1905" selection-end="1905" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/trunklog.php"> - <provider selected="true" editor-type-id="text-editor"> - <state line="5" column="15" selection-start="126" selection-end="126" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/generateHourlys.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$/calllog.php"> - <provider selected="true" editor-type-id="text-editor"> - <state line="20" column="93" selection-start="386" selection-end="386" vertical-scroll-proportion="0.44444445"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/common.inc.php"> - <provider selected="true" editor-type-id="text-editor"> - <state line="72" column="49" selection-start="2814" selection-end="2814" vertical-scroll-proportion="-17.5"> - <folding> - <marker date="1357865020704" expanded="true" signature="2886:3131" placeholder="..." /> - <marker date="1357865020704" expanded="true" signature="2955:2993" placeholder="..." /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/datepicker.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="14" column="55" selection-start="583" selection-end="583" vertical-scroll-proportion="0.31111112"> - <folding> - <element signature="n#style#0;n#span#0;n#td#0;n#tr#0;n#table#0;n#div#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#0;n#td#1;n#tr#0;n#table#0;n#div#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#span#0;n#td#2;n#tr#0;n#table#0;n#div#0;n#!!top" expanded="true" /> - </folding> - </state> - </provider> - </entry> - </component> -</project> -
--- a/generateHourlys.php +++ b/generateHourlys.php @@ -1,37 +1,51 @@ <?php include('common.inc.php'); function processHourly($hourly) { - $filename = $hourly['tgid'].'-'.str_replace(' 00:00:00+1','',$hourly['aday']).'-'.$hourly['ahour'].'.3gp'; + $filename = str_replace(' ',"_",$hourly['tgid']).'-'.str_replace(' 00:00:00+1','',$hourly['aday']).'-'.$hourly['ahour'].'.3gp'; - if(!file_exists("hourly/".$filename)) { + $hfilename = $hourly['tgid'] . '-' . str_replace(' 00:00:00+10', '', $hourly['aday']) . '-' . $hourly['ahour'] . '.3gp'; - $filenames = explode(",",$hourly['filenames']); - $cmd = "/usr/local/bin/ffmpeg -filter_complex concat=n=".count($filenames).":v=0:a=1 -i data/".implode(" -i data/",$filenames)." -ar 8000 -ab 4.75k -ac 1 hourly/".$filename . ' 2>&1'; + if (!file_exists("hourly/" . $hfilename)) { + + $filenames = explode(",", $hourly['filenames']); + $cmd = "/usr/local/bin/ffmpeg -filter_complex concat=n=" . count($filenames) . ":v=0:a=1 -i data/" . implode(" -i data/", $filenames) . " -ar 8000 -ab 4.75k -ac 1 hourly/" . $hfilename . ' 2>&1'; //print_r($hourly); - exec ( $cmd,$output,$returncode ); - echo $cmd."<br>\n"; + exec($cmd, $output, $returncode); + echo $cmd . "<br>\n"; if ($returncode != 10) { - //print_r($output); + print_r($output); //die(); } else { - /* insert - "filename" text NOT NULL, - "files" text ARRAY NOT NULL, - "datetime" timestamp NOT NULL - */ - // delete wav files? can we link to times in a compilation? + $q = " insert into compilations (filename files datetime) ('" . $hfilename . "',{'" . implode("', '", $filenames) . "'},'" . strtottime($hourly['aday'] . ' +' . $hourly['ahour'] . " hours')") . "' "; + + foreach ($filenames as $filename) { + $q = "UPDATE recordings SET archived = '$hfilename' WHERE filename = '$filename' "; + } } } } -$sth = $conn->prepare("select tgid, extract(hour from call_timestamp) ahour, date_trunc('day', call_timestamp) aday, count(filename), array_to_string(array_agg(filename order by call_timestamp), ',') filenames from recordings group by tgid, ahour, aday order by aday DESC, ahour, tgid;"); +/*$sth = $conn->prepare("select tgid, extract(hour from call_timestamp) ahour, date_trunc('day', call_timestamp) aday, +count(filename), array_to_string(array_agg(filename order by call_timestamp), ',') filenames from recordings group by tgid, ahour, aday order by aday DESC, ahour, tgid;"); + +$sth = $conn->prepare("SELECT tgid, EXTRACT(HOUR FROM call_timestamp) ahour, date_trunc('day', call_timestamp) aday, COUNT(filename), array_to_string(array_agg(filename ORDER BY call_timestamp), ',') filenames FROM recordings GROUP BY tgid, ahour, aday ORDER BY aday DESC, ahour, tgid;"); // TODO use tgid categories instead, tgid too specific $sth->execute(); $hourlies = $sth->fetchAll(PDO::FETCH_ASSOC); -foreach($hourlies as $hourly) { +foreach ($hourlies as $hourly) { processHourly($hourly); } -$sth = $conn->prepare("select 'hour' as tgid, extract(hour from call_timestamp) ahour, date_trunc('day', call_timestamp) aday, count(filename), array_to_string(array_agg(filename order by call_timestamp), ',') filenames from recordings group by ahour, aday order by aday DESC, ahour;"); +$sth = $conn->prepare("select 'hour' as tgid, extract(hour from call_timestamp) ahour, date_trunc('day', call_timestamp) aday, +count(filename), array_to_string(array_agg(filename order by call_timestamp), ',') filenames from recordings group by ahour, aday order by aday DESC, ahour;"); + +$sth->execute(); +$hourlies = $sth->fetchAll(PDO::FETCH_ASSOC); +foreach ($hourlies as $hourly) { + processHourly($hourly); +} +$sth = $conn->prepare("select coalesce(category,'unknown') as tgid, extract(hour from call_timestamp) ahour, date_trunc('day', call_timestamp) aday,