karsten/scattport-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of disposed.de:scattport

Browse Source
This commit is contained in:
Eike Foken
2011-04-22 02:56:12 +02:00
parent 7a7b05652c 43007a3c49
commit 8892918a7a
5 changed files with 120 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
application/models/job.php Normal file
View File

@@ -0,0 +1,23 @@
<?php
/**
* @author Karsten Heiken, karsten@disposed.de
*/
class Job extends CI_Model {
/**
* Update the progress of a given job.
*
* @param string $job_id The job's id you want to update.
* @param integer $progress The progress of the job.
*/
public function update($job_id, $progress) {
$finished_at = "";
if($progress == 100)
$finished_at = ", `finished_at`=NOW()";
$this->db->query("UPDATE `jobs` SET `progress`=".
$this->db->escape($progress).$finished_at. " WHERE `id`=".
$this->db->escape($job_id));
}
}

8
application/models/project.php
View File

@@ -14,7 +14,7 @@ class Project extends CI_Model {
* @return array The user's projects.
*/
public function getOwn() {
$query = $this->db->where(array('owner' => $this->session->user_data('user_id')))
$query = $this->db->where(array('owner' => $this->session->userdata('user_id')))
->order_by('lastaccess', 'desc')
->get('projects');
$projects = $query->result_array();
@@ -25,6 +25,7 @@ class Project extends CI_Model {
$ownProjects[$i]['id'] = '/projects/own/'.$project['id'];
$ownProjects[$i]['cls'] = 'folder';
$ownProjects[$i]['text'] = $project['name'];
$ownProjects[$i]['prjId'] = $project['id'];
$ownProjects[$i]['leaf'] = true;
$i++;
}
@@ -38,7 +39,8 @@ class Project extends CI_Model {
* @return array The shared projects.
*/
public function getShared() {
$this->db->select('*')->from('shares')->order_by('lastaccess', 'desc')->where(array('user_id' => $this->session->user_data('user_id')));
$this->load->library('session');
$this->db->select('*')->from('shares')->order_by('lastaccess', 'desc')->where(array('user_id' => $this->session->userdata('user_id')));
$this->db->join('projects', 'projects.id = shares.project_id');
$query = $this->db->get();
@@ -50,6 +52,7 @@ class Project extends CI_Model {
$sharedProjects[$i]['id'] = '/projects/shared/'.$project['id'];
$sharedProjects[$i]['cls'] = 'folder';
$sharedProjects[$i]['text'] = $project['name'];
$sharedProjects[$i]['prjId'] = $project['id'];
$sharedProjects[$i]['leaf'] = true;
$i++;
}
@@ -74,6 +77,7 @@ class Project extends CI_Model {
$publicProjects[$i]['id'] = '/projects/public/'.$project['id'];
$publicProjects[$i]['cls'] = 'folder';
$publicProjects[$i]['text'] = $project['name'];
$publicProjects[$i]['prjId'] = $project['id'];
$publicProjects[$i]['leaf'] = true;
$i++;
}

40
application/models/server.php Normal file
View File

@@ -0,0 +1,40 @@
<?php
/**
* @author Karsten Heiken, karsten@disposed.de
*/
class Server extends CI_Model {
/**
* Get a list of all available servers.
*
* @return array List of all available servers.
*/
public function get_all() {
return $this->db->get('servers')->result_array();
}
/**
* Get a list of servers that could handle another job.
*
* @return array List of servers that could handle another job.
*/
public function get_idle() {
return $this->db->get_where('servers', 'workload <= 2')->result_array();
}
/**
* Set a server's workload.
*
* In order to check if a server can handle another job we need to know
* the workload of every server.
*
* @param type $secret The server's secret for basic authentication.
* @param type $workload The server's workload.
*/
public function update_workload($secret, $workload) {
$this->db->query("UPDATE `servers` SET `workload`=".$this->db->escape($workload)
. ", `last_update`=NOW()"
. " WHERE `secret`=".$this->db->escape($secret));
}
}